From 42b3baf32fe003280f26d46af9ef4bdf443e04e3 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Thu, 18 Jul 2024 15:38:10 +0200 Subject: [PATCH] clippy: simplify code according to nightly 'needless_borrows_for_generic_args' lint https://rust-lang.github.io/rust-clippy/master/index.html#/needless_borrows_for_generic_args --- tests/by-util/test_cp.rs | 4 ++-- tests/by-util/test_install.rs | 2 +- tests/by-util/test_join.rs | 8 ++++---- tests/by-util/test_ls.rs | 4 ++-- tests/by-util/test_mv.rs | 2 +- tests/by-util/test_rm.rs | 14 +++++++------- tests/by-util/test_shuf.rs | 10 +++++----- tests/by-util/test_sort.rs | 4 ++-- tests/by-util/test_tail.rs | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs index c831bb08f..0b5c81746 100644 --- a/tests/by-util/test_cp.rs +++ b/tests/by-util/test_cp.rs @@ -2028,7 +2028,7 @@ fn test_cp_archive_recursive() { let result = scene2 .cmd("ls") .arg("-al") - .arg(&at.subdir.join(TEST_COPY_TO_FOLDER)) + .arg(at.subdir.join(TEST_COPY_TO_FOLDER)) .run(); println!("ls dest {}", result.stdout_str()); @@ -2036,7 +2036,7 @@ fn test_cp_archive_recursive() { let result = scene2 .cmd("ls") .arg("-al") - .arg(&at.subdir.join(TEST_COPY_TO_FOLDER_NEW)) + .arg(at.subdir.join(TEST_COPY_TO_FOLDER_NEW)) .run(); println!("ls dest {}", result.stdout_str()); diff --git a/tests/by-util/test_install.rs b/tests/by-util/test_install.rs index c00c5a5db..f1e3302e1 100644 --- a/tests/by-util/test_install.rs +++ b/tests/by-util/test_install.rs @@ -962,7 +962,7 @@ fn test_install_dir() { at.mkdir(dir); ucmd.arg(file1) .arg(file2) - .arg(&format!("--target-directory={dir}")) + .arg(format!("--target-directory={dir}")) .succeeds() .no_stderr(); diff --git a/tests/by-util/test_join.rs b/tests/by-util/test_join.rs index e2e5dc868..955f21d68 100644 --- a/tests/by-util/test_join.rs +++ b/tests/by-util/test_join.rs @@ -335,7 +335,7 @@ fn wrong_line_order() { .arg("fields_4.txt") .fails() .stdout_contains("7 g f 4 fg") - .stderr_is(&format!( + .stderr_is(format!( "{0} {1}: fields_4.txt:5: is not sorted: 11 g 5 gh\n{0} {1}: input is not in sorted order\n", ts.bin_path.to_string_lossy(), ts.util_name @@ -347,7 +347,7 @@ fn wrong_line_order() { .arg("fields_4.txt") .fails() .stdout_does_not_contain("7 g f 4 fg") - .stderr_is(&format!( + .stderr_is(format!( "{0}: fields_4.txt:5: is not sorted: 11 g 5 gh\n", ts.util_name )); @@ -361,7 +361,7 @@ fn both_files_wrong_line_order() { .arg("fields_5.txt") .fails() .stdout_contains("5 e 3 ef") - .stderr_is(&format!( + .stderr_is(format!( "{0} {1}: fields_5.txt:4: is not sorted: 3\n{0} {1}: fields_4.txt:5: is not sorted: 11 g 5 gh\n{0} {1}: input is not in sorted order\n", ts.bin_path.to_string_lossy(), ts.util_name @@ -373,7 +373,7 @@ fn both_files_wrong_line_order() { .arg("fields_5.txt") .fails() .stdout_does_not_contain("5 e 3 ef") - .stderr_is(&format!( + .stderr_is(format!( "{0}: fields_5.txt:4: is not sorted: 3\n", ts.util_name )); diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index 2e3f31290..57802d7f3 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -75,7 +75,7 @@ fn test_invalid_value_returns_1() { "--time", ] { new_ucmd!() - .arg(&format!("{flag}=definitely_invalid_value")) + .arg(format!("{flag}=definitely_invalid_value")) .fails() .no_stdout() .code_is(1); @@ -87,7 +87,7 @@ fn test_invalid_value_returns_2() { // Invalid values to flags *sometimes* result in error code 2: for flag in ["--block-size", "--width", "--tab-size"] { new_ucmd!() - .arg(&format!("{flag}=definitely_invalid_value")) + .arg(format!("{flag}=definitely_invalid_value")) .fails() .no_stdout() .code_is(2); diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs index b6943a311..db9e27210 100644 --- a/tests/by-util/test_mv.rs +++ b/tests/by-util/test_mv.rs @@ -133,7 +133,7 @@ fn test_mv_move_file_between_dirs() { assert!(at.file_exists(format!("{dir1}/{file}"))); - ucmd.arg(&format!("{dir1}/{file}")) + ucmd.arg(format!("{dir1}/{file}")) .arg(dir2) .succeeds() .no_stderr(); diff --git a/tests/by-util/test_rm.rs b/tests/by-util/test_rm.rs index 8a9021c75..f997688c8 100644 --- a/tests/by-util/test_rm.rs +++ b/tests/by-util/test_rm.rs @@ -30,9 +30,9 @@ fn test_rm_failed() { let (_at, mut ucmd) = at_and_ucmd!(); let file = "test_rm_one_file"; // Doesn't exist - ucmd.arg(file).fails().stderr_contains(&format!( - "cannot remove '{file}': No such file or directory" - )); + ucmd.arg(file) + .fails() + .stderr_contains(format!("cannot remove '{file}': No such file or directory")); } #[test] @@ -170,7 +170,7 @@ fn test_rm_non_empty_directory() { ucmd.arg("-d") .arg(dir) .fails() - .stderr_contains(&format!("cannot remove '{dir}': Directory not empty")); + .stderr_contains(format!("cannot remove '{dir}': Directory not empty")); assert!(at.file_exists(file_a)); assert!(at.dir_exists(dir)); } @@ -225,7 +225,7 @@ fn test_rm_directory_without_flag() { ucmd.arg(dir) .fails() - .stderr_contains(&format!("cannot remove '{dir}': Is a directory")); + .stderr_contains(format!("cannot remove '{dir}': Is a directory")); } #[test] @@ -289,7 +289,7 @@ fn test_rm_symlink_dir() { .ucmd() .arg(link) .fails() - .stderr_contains(&format!("cannot remove '{link}': Is a directory")); + .stderr_contains(format!("cannot remove '{link}': Is a directory")); assert!(at.dir_exists(link)); @@ -337,7 +337,7 @@ fn test_rm_verbose_slash() { ucmd.arg("-r") .arg("-f") .arg("-v") - .arg(&format!("{dir}///")) + .arg(format!("{dir}///")) .succeeds() .stdout_only(format!( "removed '{file_a_normalized}'\nremoved directory '{dir}'\n" diff --git a/tests/by-util/test_shuf.rs b/tests/by-util/test_shuf.rs index 40ece0f13..067964fe1 100644 --- a/tests/by-util/test_shuf.rs +++ b/tests/by-util/test_shuf.rs @@ -143,7 +143,7 @@ fn test_range_repeat_no_overflow_1_max() { let upper_bound = usize::MAX; let result = new_ucmd!() .arg("-rn1") - .arg(&format!("-i1-{upper_bound}")) + .arg(format!("-i1-{upper_bound}")) .succeeds(); result.no_stderr(); @@ -161,7 +161,7 @@ fn test_range_repeat_no_overflow_0_max_minus_1() { let upper_bound = usize::MAX - 1; let result = new_ucmd!() .arg("-rn1") - .arg(&format!("-i0-{upper_bound}")) + .arg(format!("-i0-{upper_bound}")) .succeeds(); result.no_stderr(); @@ -179,7 +179,7 @@ fn test_range_permute_no_overflow_1_max() { let upper_bound = usize::MAX; let result = new_ucmd!() .arg("-n1") - .arg(&format!("-i1-{upper_bound}")) + .arg(format!("-i1-{upper_bound}")) .succeeds(); result.no_stderr(); @@ -197,7 +197,7 @@ fn test_range_permute_no_overflow_0_max_minus_1() { let upper_bound = usize::MAX - 1; let result = new_ucmd!() .arg("-n1") - .arg(&format!("-i0-{upper_bound}")) + .arg(format!("-i0-{upper_bound}")) .succeeds(); result.no_stderr(); @@ -218,7 +218,7 @@ fn test_range_permute_no_overflow_0_max() { let upper_bound = usize::MAX; let result = new_ucmd!() .arg("-n1") - .arg(&format!("-i0-{upper_bound}")) + .arg(format!("-i0-{upper_bound}")) .succeeds(); result.no_stderr(); diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs index 42a877e4e..67930fa40 100644 --- a/tests/by-util/test_sort.rs +++ b/tests/by-util/test_sort.rs @@ -889,7 +889,7 @@ fn test_dictionary_and_nonprinting_conflicts() { for restricted_arg in ["d", "i"] { for conflicting_arg in &conflicting_args { new_ucmd!() - .arg(&format!("-{restricted_arg}{conflicting_arg}")) + .arg(format!("-{restricted_arg}{conflicting_arg}")) .fails(); } for conflicting_arg in &conflicting_args { @@ -897,7 +897,7 @@ fn test_dictionary_and_nonprinting_conflicts() { .args(&[ format!("-{restricted_arg}").as_str(), "-k", - &format!("1,1{conflicting_arg}"), + format!("1,1{conflicting_arg}").as_str(), ]) .succeeds(); } diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs index 07f49196e..d1c32c3d7 100644 --- a/tests/by-util/test_tail.rs +++ b/tests/by-util/test_tail.rs @@ -4560,7 +4560,7 @@ fn test_gnu_args_c() { .arg("-12c") .pipe_in(format!("x{}z", "y".repeat(12))) .succeeds() - .stdout_only(&format!("{}z", "y".repeat(11))); + .stdout_only(format!("{}z", "y".repeat(11))); } #[test] @@ -4594,7 +4594,7 @@ fn test_gnu_args_l() { .arg("-l") .pipe_in(format!("x{}z", "y\n".repeat(10))) .succeeds() - .stdout_only(&format!("{}z", "y\n".repeat(9))); + .stdout_only(format!("{}z", "y\n".repeat(9))); } #[test] @@ -4681,7 +4681,7 @@ fn test_gnu_args_b() { .arg("-b") .pipe_in("x\n".repeat(512 * 10 / 2 + 1)) .succeeds() - .stdout_only(&"x\n".repeat(512 * 10 / 2)); + .stdout_only("x\n".repeat(512 * 10 / 2)); } #[test]