From 6d245b263bba2c57c00da739b70c7966003aa29b Mon Sep 17 00:00:00 2001
From: kivimango <balazsviktor23@gmail.com>
Date: Wed, 16 Aug 2023 23:24:07 +0200
Subject: [PATCH] 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");
--
GitLab