clippy: Fix needless_borrows

src/bin/cook.rs

@@ -27,7 +27,7 @@ fn remove_all(path: &Path) -> Result<(), String> {
 }
 
 fn create_dir(dir: &Path) -> Result<(), String> {
-    fs::create_dir(&dir).map_err(|err| format!(
+    fs::create_dir(dir).map_err(|err| format!(
         "failed to create '{}': {}\n{:?}",
         dir.display(),
         err,
@@ -70,7 +70,7 @@ fn modified_dir_inner<F: FnMut(&DirEntry) -> bool>(dir: &Path, filter: F) -> io:
 }
 
 fn modified_dir(dir: &Path) -> Result<SystemTime, String> {
-    modified_dir_inner(&dir, |_| true).map_err(|err| format!(
+    modified_dir_inner(dir, |_| true).map_err(|err| format!(
         "failed to get modified time of '{}': {}\n{:#?}",
         dir.display(),
         err,
@@ -79,7 +79,7 @@ fn modified_dir(dir: &Path) -> Result<SystemTime, String> {
 }
 
 fn modified_dir_ignore_git(dir: &Path) -> Result<SystemTime, String> {
-    modified_dir_inner(&dir, |entry| {
+    modified_dir_inner(dir, |entry| {
         entry.file_name().to_str().map(|s| s != ".git").unwrap_or(true)
     }).map_err(|err| format!(
         "failed to get modified time of '{}': {}\n{:#?}",
@@ -172,9 +172,9 @@ fn fetch(recipe_dir: &Path, source: &Option<SourceRecipe>) -> Result<PathBuf, St
 
                 // Clone the repository to source.tmp
                 let mut command = Command::new("git");
-                command.arg("clone").arg("--recursive").arg(&git);
+                command.arg("clone").arg("--recursive").arg(git);
                 if let Some(branch) = branch {
-                    command.arg("--branch").arg(&branch);
+                    command.arg("--branch").arg(branch);
                 }
                 command.arg(&source_dir_tmp);
                 run_command(command)?;
@@ -194,7 +194,7 @@ fn fetch(recipe_dir: &Path, source: &Option<SourceRecipe>) -> Result<PathBuf, St
                 // Reset origin
                 let mut command = Command::new("git");
                 command.arg("-C").arg(&source_dir);
-                command.arg("remote").arg("set-url").arg("origin").arg(&git);
+                command.arg("remote").arg("set-url").arg("origin").arg(git);
                 run_command(command)?;
 
                 // Fetch origin
@@ -215,7 +215,7 @@ fn fetch(recipe_dir: &Path, source: &Option<SourceRecipe>) -> Result<PathBuf, St
                 // Check out specified revision
                 let mut command = Command::new("git");
                 command.arg("-C").arg(&source_dir);
-                command.arg("checkout").arg(&rev);
+                command.arg("checkout").arg(rev);
                 run_command(command)?;
             } else {
                 //TODO: complicated stuff to check and reset branch to origin
@@ -259,7 +259,7 @@ fi"#);
                     let source_tar_tmp = recipe_dir.join("source.tar.tmp");
 
                     let mut command = Command::new("wget");
-                    command.arg(&tar);
+                    command.arg(tar);
                     command.arg("-O").arg(&source_tar_tmp);
                     run_command(command)?;
 
@@ -328,7 +328,7 @@ fi"#);
 
                 // Apply patches
                 for patch_name in patches {
-                    let patch_file = recipe_dir.join(&patch_name);
+                    let patch_file = recipe_dir.join(patch_name);
                     if ! patch_file.is_file() {
                         return Err(format!(
                             "failed to find patch file '{}'",
@@ -376,7 +376,7 @@ fi"#);
 }
 
 fn build(recipe_dir: &Path, source_dir: &Path, target_dir: &Path, build: &BuildRecipe) -> Result<PathBuf, String> {
-    let source_modified = modified_dir_ignore_git(&source_dir)?;
+    let source_modified = modified_dir_ignore_git(source_dir)?;
 
     let sysroot_dir = target_dir.join("sysroot");
     // Rebuild sysroot if source is newer
@@ -603,11 +603,11 @@ fn package(_recipe_dir: &Path, stage_dir: &Path, target_dir: &Path, _package: &P
             create_dir(Path::new("build"))?;
         }
         let (public_key, secret_key) = pkgar_keys::SecretKeyFile::new();
-        public_key.save(&public_path).map_err(|err| format!(
+        public_key.save(public_path).map_err(|err| format!(
             "failed to save pkgar public key: {:?}",
             err
         ))?;
-        secret_key.save(&secret_path).map_err(|err| format!(
+        secret_key.save(secret_path).map_err(|err| format!(
             "failed to save pkgar secret key: {:?}",
             err
         ))?;
@@ -617,7 +617,7 @@ fn package(_recipe_dir: &Path, stage_dir: &Path, target_dir: &Path, _package: &P
     // Rebuild package if stage is newer
     //TODO: rebuild on recipe changes
     if package_file.is_file() {
-        let stage_modified = modified_dir(&stage_dir)?;
+        let stage_modified = modified_dir(stage_dir)?;
         if modified(&package_file)? < stage_modified {
             eprintln!("DEBUG: '{}' newer than '{}'", stage_dir.display(), package_file.display());
             remove_all(&package_file)?;
@@ -638,7 +638,7 @@ fn package(_recipe_dir: &Path, stage_dir: &Path, target_dir: &Path, _package: &P
 }
 
 fn cook(recipe_dir: &Path, recipe: &Recipe, fetch_only: bool) -> Result<(), String> {
-    let source_dir = fetch(&recipe_dir, &recipe.source).map_err(|err| format!(
+    let source_dir = fetch(recipe_dir, &recipe.source).map_err(|err| format!(
         "failed to fetch: {}",
         err
     ))?;
@@ -654,12 +654,12 @@ fn cook(recipe_dir: &Path, recipe: &Recipe, fetch_only: bool) -> Result<(), Stri
         create_dir(&target_dir)?;
     }
 
-    let stage_dir = build(&recipe_dir, &source_dir, &target_dir, &recipe.build).map_err(|err| format!(
+    let stage_dir = build(recipe_dir, &source_dir, &target_dir, &recipe.build).map_err(|err| format!(
         "failed to build: {}",
         err
     ))?;
 
-    let _package_file = package(&recipe_dir, &stage_dir, &target_dir, &recipe.package).map_err(|err| format!(
+    let _package_file = package(recipe_dir, &stage_dir, &target_dir, &recipe.package).map_err(|err| format!(
         "failed to package: {}",
         err
     ))?;