Reorder arguments to be more idiomatic (app last) in `Repo::sync_incr…

…emental`
twitter · Nov 10, 2022 · 1addb2d · 1addb2d
1 parent ea85093
commit 1addb2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/focus/internals/src/lib/model/repo.rs b/focus/internals/src/lib/model/repo.rs
@@ -777,7 +777,7 @@ impl Repo {
             .context("Configuring the outlining tree")?;
 
         let mut outline_patterns = if let Some(cache) = cache {
-            self.sync_incremental(commit_id, targets, outlining_tree, app.clone(), cache)
+            self.sync_incremental(commit_id, targets, outlining_tree, cache, app.clone())
         } else {
             self.sync_one_shot(commit_id, targets, outlining_tree, app.clone())
         }?;
@@ -820,8 +820,8 @@ impl Repo {
         commit_id: Oid,
         targets: &HashSet<Target>,
         outlining_tree: &OutliningTree,
-        app: Arc<App>,
         cache: &RocksDBCache,
+        app: Arc<App>,
     ) -> Result<PatternSet> {
         let index_config = &self.config().index;
         let commit = self

diff --git a/focus/util/src/git/snapshot.rs b/focus/util/src/git/snapshot.rs
@@ -24,7 +24,6 @@ use crate::{app::App, git_helper, lock_file::LockFile};
 
 use super::model::Disposition;
 
-pub struct CreationResult {
 pub struct SnapshotResult {
     pub path: PathBuf,
 }
@@ -229,7 +228,8 @@ mod testing {
         {
             let untracked_entries =
                 initial_status.find_entries_with_disposition(Disposition::Untracked)?;
-            let untracked_entry = untracked_entries.first()
+            let untracked_entry = untracked_entries
+                .first()
                 .ok_or_else(|| anyhow::anyhow!("Expected an untracked entry and there was none"))?;
             assert_eq!(untracked_entry.path.as_path(), &untracked_file_name);