diff --git a/src/cli/apply.rs b/src/cli/apply.rs index be7fe35..9fa5bbf 100644 --- a/src/cli/apply.rs +++ b/src/cli/apply.rs @@ -31,7 +31,7 @@ pub struct ApplyArgs { /// Add extra guide message to GitHub format output. #[arg(short, long, env)] guide: Option, - /// Do not fail if there are confirmed findings. Fail on errors even if no_fail is true. + /// Do not fail if there are confirmed findings. Fail on errors even if `no_fail` is true. #[arg(short, long, env)] no_fail: bool, } diff --git a/src/cli/review.rs b/src/cli/review.rs index a0cd597..63253bd 100644 --- a/src/cli/review.rs +++ b/src/cli/review.rs @@ -171,7 +171,7 @@ fn print_confirmed_summary(results: &[FilterResult], out: &mut dyn Write) -> any results_by_rule_id_sorted.sort_by_key(|(_, r)| Reverse(r.confirmed)); for (rule_id, per_result) in &results_by_rule_id_sorted { builder.push_record([ - &rule_id, + rule_id, &(per_result.confirmed + per_result.allowed).to_string(), &per_result.allowed.to_string(), &per_result.confirmed.to_string(), diff --git a/src/config.rs b/src/config.rs index 88717f8..5676464 100644 --- a/src/config.rs +++ b/src/config.rs @@ -203,7 +203,7 @@ mod tests { #[test] fn test_validate_duplication_ok() { let mut allowlist = test::build_empty_allowlist(); - allowlist.id = "another-allowlist".to_owned(); + "another-allowlist".clone_into(&mut allowlist.id); let allowlists = vec![allowlist, test::build_empty_allowlist()]; assert!(validate_duplication(&allowlists).is_ok()); } diff --git a/src/diff.rs b/src/diff.rs index d249a65..319aa47 100644 --- a/src/diff.rs +++ b/src/diff.rs @@ -163,7 +163,7 @@ mod tests { fn test_compute_diff_confimed_diff_before_empty_after() -> Result { let fingerprint = "fingerprint-a".to_owned(); let mut finding = build_empty_finding(); - finding.fingerprint = fingerprint.clone(); + finding.fingerprint.clone_from(&fingerprint); let befores = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![finding], @@ -186,7 +186,7 @@ mod tests { fn test_compute_diff_confimed_diff_before_no_filter_result() -> Result { let fingerprint = "fingerprint-a".to_owned(); let mut finding = build_empty_finding(); - finding.fingerprint = fingerprint.clone(); + finding.fingerprint.clone_from(&fingerprint); let befores = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![finding], @@ -206,7 +206,7 @@ mod tests { fn test_compute_diff_confimed_diff_before_present_after() -> Result { let fingerprint_before = "fingerprint-before".to_owned(); let mut finding_before = build_empty_finding(); - finding_before.fingerprint = fingerprint_before.clone(); + finding_before.fingerprint.clone_from(&fingerprint_before); let befores = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![finding_before], @@ -215,7 +215,7 @@ mod tests { let fingerprint_after = "fingerprint-after".to_owned(); let mut finding_after = build_empty_finding(); - finding_after.fingerprint = fingerprint_after.clone(); + finding_after.fingerprint.clone_from(&fingerprint_after); let afters = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![finding_after], @@ -235,7 +235,7 @@ mod tests { fn test_compute_diff_confimed_diff_after() -> Result { let fingerprint = "fingerprint-a".to_owned(); let mut finding = build_empty_finding(); - finding.fingerprint = fingerprint.clone(); + finding.fingerprint.clone_from(&fingerprint); let befores = vec![build_empty_filter_result("repo1")]; let afters = vec![FilterResult { repo_name: "repo1".to_owned(), @@ -255,7 +255,7 @@ mod tests { fn test_compute_diff_allowed_diff_before() -> Result { let fingerprint = "fingerprint-a".to_owned(); let mut allowed_finding = build_empty_allowed_finding(); - allowed_finding.finding.fingerprint = fingerprint.clone(); + allowed_finding.finding.fingerprint.clone_from(&fingerprint); let befores = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![], @@ -279,7 +279,7 @@ mod tests { fn test_compute_diff_confimed_diff_after_no_filter_result() -> Result { let fingerprint = "fingerprint-a".to_owned(); let mut finding = build_empty_finding(); - finding.fingerprint = fingerprint.clone(); + finding.fingerprint.clone_from(&fingerprint); let befores = vec![]; let afters = vec![FilterResult { repo_name: "repo1".to_owned(), @@ -299,7 +299,7 @@ mod tests { fn test_compute_diff_confimed_diff_after_present_before() -> Result { let fingerprint_before = "fingerprint-before".to_owned(); let mut allowed_finding_before = build_empty_allowed_finding(); - allowed_finding_before.finding.fingerprint = fingerprint_before.clone(); + allowed_finding_before.finding.fingerprint.clone_from(&fingerprint_before); let befores = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![], @@ -308,7 +308,7 @@ mod tests { let fingerprint_after = "fingerprint-after".to_owned(); let mut allowed_finding_after = build_empty_allowed_finding(); - allowed_finding_after.finding.fingerprint = fingerprint_after.clone(); + allowed_finding_after.finding.fingerprint.clone_from(&fingerprint_after); let afters = vec![FilterResult { repo_name: "repo1".to_owned(), confirmed: vec![], diff --git a/src/filter.rs b/src/filter.rs index 23ccec1..37d39eb 100644 --- a/src/filter.rs +++ b/src/filter.rs @@ -209,7 +209,7 @@ mod tests { let mut finding = build_empty_finding(); allowlist.stopwords = Some(vec!["dev".to_owned()]); - finding.secret = "334-dev-kjdlsa93428".to_owned(); + "334-dev-kjdlsa93428".clone_into(&mut finding.secret); assert_allow(&allowlist, &finding) } @@ -219,7 +219,7 @@ mod tests { let mut finding = build_empty_finding(); set_regex_expr_to_allowlist(&mut allowlist, "^test-secret$")?; - finding.secret = "test-secret".to_owned(); + "test-secret".clone_into(&mut finding.secret); assert_allow(&allowlist, &finding) } @@ -229,7 +229,7 @@ mod tests { let mut finding = build_empty_finding(); set_regex_expr_to_allowlist(&mut allowlist, "^test$")?; - finding.secret = "test-secret".to_owned(); + "test-secret".clone_into(&mut finding.secret); assert_not_allow(&allowlist, &finding) } @@ -240,8 +240,8 @@ mod tests { allowlist.regex_target = Some(RegexTarget::Match); set_regex_expr_to_allowlist(&mut allowlist, "^key = test-secret")?; - finding.secret = "test-secret".to_owned(); - finding.matched = "key = test-secret".to_owned(); + "test-secret".clone_into(&mut finding.secret); + "key = test-secret".clone_into(&mut finding.matched); assert_allow(&allowlist, &finding) } @@ -252,8 +252,8 @@ mod tests { allowlist.regex_target = Some(RegexTarget::Match); set_regex_expr_to_allowlist(&mut allowlist, "^test-secret$")?; - finding.secret = "test-secret".to_owned(); - finding.matched = "key = test-secret".to_owned(); + "test-secret".clone_into(&mut finding.secret); + "key = test-secret".clone_into(&mut finding.matched); assert_not_allow(&allowlist, &finding) } @@ -264,9 +264,9 @@ mod tests { allowlist.regex_target = Some(RegexTarget::Line); set_regex_expr_to_allowlist(&mut allowlist, "^book_key = test-secret")?; - finding.secret = "test-secret".to_owned(); - finding.matched = "key = test-secret".to_owned(); - finding.line = "book_key = test-secret # comment".to_owned(); + "test-secret".clone_into(&mut finding.secret); + "key = test-secret".clone_into(&mut finding.matched); + "book_key = test-secret # comment".clone_into(&mut finding.line); assert_allow(&allowlist, &finding) } }