diff --git a/src/bin/cook.rs b/src/bin/cook.rs index f93dac903..0d076c838 100644 --- a/src/bin/cook.rs +++ b/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 bool>(dir: &Path, filter: F) -> io: } fn modified_dir(dir: &Path) -> Result { - 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 { } fn modified_dir_ignore_git(dir: &Path) -> Result { - 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) -> Result) -> Result) -> Result Result { - 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 ))?;