From 213a33bb43fc44145c295325971668a0fa67676c Mon Sep 17 00:00:00 2001 From: kivimango Date: Wed, 16 Aug 2023 12:14:14 +0200 Subject: [PATCH 1/6] Use shorthand init --- src/progress_bar.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/progress_bar.rs b/src/progress_bar.rs index c02b939d3..597fb9552 100644 --- a/src/progress_bar.rs +++ b/src/progress_bar.rs @@ -10,8 +10,8 @@ pub struct ProgressBarRead<'p, 'r, P: Write + 'p, R: Read + 'r> { impl<'p, 'r, P: Write, R: Read> ProgressBarRead<'p, 'r, P, R> { pub fn new(pb: &'p mut ProgressBar

, r: &'r mut R) -> ProgressBarRead<'p, 'r, P, R> { ProgressBarRead { - pb: pb, - r: r + pb, + r } } } @@ -32,8 +32,8 @@ pub struct ProgressBarWrite<'p, 'w, P: Write + 'p, W: Write + 'w> { impl<'p, 'w, P: Write, W: Write> ProgressBarWrite<'p, 'w, P, W> { pub fn new(pb: &'p mut ProgressBar

, w: &'w mut W) -> ProgressBarWrite<'p, 'w, P, W> { ProgressBarWrite { - pb: pb, - w: w + pb, + w } } } From 10ea123fd66c3a6ac8b7b0f95c45a608d03e3aca Mon Sep 17 00:00:00 2001 From: kivimango Date: Wed, 16 Aug 2023 12:15:48 +0200 Subject: [PATCH 2/6] Renamed unused new() to _new() --- src/progress_bar.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/progress_bar.rs b/src/progress_bar.rs index 597fb9552..75eceb475 100644 --- a/src/progress_bar.rs +++ b/src/progress_bar.rs @@ -30,7 +30,7 @@ pub struct ProgressBarWrite<'p, 'w, P: Write + 'p, W: Write + 'w> { } impl<'p, 'w, P: Write, W: Write> ProgressBarWrite<'p, 'w, P, W> { - pub fn new(pb: &'p mut ProgressBar

, w: &'w mut W) -> ProgressBarWrite<'p, 'w, P, W> { + pub fn _new(pb: &'p mut ProgressBar

, w: &'w mut W) -> ProgressBarWrite<'p, 'w, P, W> { ProgressBarWrite { pb, w From 33d361d43a8b757354b345a01ffbc227a163e9bb Mon Sep 17 00:00:00 2001 From: kivimango Date: Wed, 16 Aug 2023 12:17:43 +0200 Subject: [PATCH 3/6] Fix compiler warnings for unused variables --- src/bin/cook.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/cook.rs b/src/bin/cook.rs index 6b00832e5..f93dac903 100644 --- a/src/bin/cook.rs +++ b/src/bin/cook.rs @@ -204,7 +204,7 @@ fn fetch(recipe_dir: &Path, source: &Option) -> Result /dev/null || // git remote add upstream "$GIT_UPSTREAM" @@ -593,7 +593,7 @@ done Ok(stage_dir) } -fn package(recipe_dir: &Path, stage_dir: &Path, target_dir: &Path, package: &PackageRecipe) -> Result { +fn package(_recipe_dir: &Path, stage_dir: &Path, target_dir: &Path, _package: &PackageRecipe) -> Result { //TODO: metadata like dependencies, name, and version let secret_path = "build/id_ed25519.toml"; @@ -659,7 +659,7 @@ fn cook(recipe_dir: &Path, recipe: &Recipe, fetch_only: bool) -> Result<(), Stri 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 ))?; From 62f438cb38858f412775c70594bf699fdcd57425 Mon Sep 17 00:00:00 2001 From: kivimango Date: Wed, 16 Aug 2023 23:13:18 +0200 Subject: [PATCH 4/6] clippy: Fix needless_borrows --- src/bin/cook.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) 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 ))?; From 6d245b263bba2c57c00da739b70c7966003aa29b Mon Sep 17 00:00:00 2001 From: kivimango Date: Wed, 16 Aug 2023 23:24:07 +0200 Subject: [PATCH 5/6] clippy: Fix nested if statements --- src/bin/cook.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/bin/cook.rs b/src/bin/cook.rs index 0d076c838..e388fdd06 100644 --- a/src/bin/cook.rs +++ b/src/bin/cook.rs @@ -381,11 +381,9 @@ fn build(recipe_dir: &Path, source_dir: &Path, target_dir: &Path, build: &BuildR let sysroot_dir = target_dir.join("sysroot"); // Rebuild sysroot if source is newer //TODO: rebuild on recipe changes - if sysroot_dir.is_dir() { - if modified_dir(&sysroot_dir)? < source_modified { - eprintln!("DEBUG: '{}' newer than '{}'", source_dir.display(), sysroot_dir.display()); - remove_all(&sysroot_dir)?; - } + if sysroot_dir.is_dir() && modified_dir(&sysroot_dir)? < source_modified { + eprintln!("DEBUG: '{}' newer than '{}'", source_dir.display(), sysroot_dir.display()); + remove_all(&sysroot_dir)?; } if ! sysroot_dir.is_dir() { // Create sysroot.tmp @@ -427,12 +425,11 @@ fn build(recipe_dir: &Path, source_dir: &Path, target_dir: &Path, build: &BuildR let stage_dir = target_dir.join("stage"); // Rebuild stage if source is newer //TODO: rebuild on recipe changes - if stage_dir.is_dir() { - if modified_dir(&stage_dir)? < source_modified { - eprintln!("DEBUG: '{}' newer than '{}'", source_dir.display(), stage_dir.display()); - remove_all(&stage_dir)?; - } + if stage_dir.is_dir() && modified_dir(&stage_dir)? < source_modified { + eprintln!("DEBUG: '{}' newer than '{}'", source_dir.display(), stage_dir.display()); + remove_all(&stage_dir)?; } + if ! stage_dir.is_dir() { // Create stage.tmp let stage_dir_tmp = target_dir.join("stage.tmp"); From 0664e21e6d69cdd6924b057d2d51aa272623ab60 Mon Sep 17 00:00:00 2001 From: kivimango Date: Wed, 16 Aug 2023 23:25:18 +0200 Subject: [PATCH 6/6] clippy: Fix unnecessary unwrap() --- src/bin/list_recipes.rs | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/bin/list_recipes.rs b/src/bin/list_recipes.rs index da3171e1e..759dbc9ec 100644 --- a/src/bin/list_recipes.rs +++ b/src/bin/list_recipes.rs @@ -4,16 +4,21 @@ use std::process::exit; // use clap::Parser; fn main() { - let result = list_recipes( Path::new("recipes")); - if result.is_err() { - eprintln!("{}", result.err().unwrap()); - exit(2); - } else if result.as_ref().unwrap().is_empty() { - eprintln!("recipes not found"); - exit(1); - } else { - result.unwrap().iter().for_each(|recipe| println!("{}", recipe)); - exit(0); + + match result { + Ok(result) => { + if result.is_empty() { + eprintln!("recipes not found"); + exit(1); + } else { + result.iter().for_each(|recipe| println!("{recipe}")); + exit(0); + } + } + Err(error) => { + eprintln!("{error}"); + exit(2); + } } }