mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
clippy: fix warnings introduced with Rust 1.67.0
This commit is contained in:
Daniel Hofstetter
parent
fc7e51a4f8
commit
f6b646e4e5
172 changed files with 835 additions and 1034 deletions
|
|
@ -91,7 +91,7 @@ fn test_cp_existing_target() {
|
|||
assert_eq!(at.read(TEST_EXISTING_FILE), "Hello, World!\n");
|
||||
|
||||
// No backup should have been created
|
||||
assert!(!at.file_exists(&format!("{}~", TEST_EXISTING_FILE)));
|
||||
assert!(!at.file_exists(&format!("{TEST_EXISTING_FILE}~")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -211,7 +211,7 @@ fn test_cp_target_directory_is_file() {
|
|||
.arg(TEST_HOW_ARE_YOU_SOURCE)
|
||||
.arg(TEST_HELLO_WORLD_SOURCE)
|
||||
.fails()
|
||||
.stderr_contains(format!("'{}' is not a directory", TEST_HOW_ARE_YOU_SOURCE));
|
||||
.stderr_contains(format!("'{TEST_HOW_ARE_YOU_SOURCE}' is not a directory"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -374,7 +374,7 @@ fn test_cp_arg_backup() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -390,7 +390,7 @@ fn test_cp_arg_backup_with_other_args() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -406,7 +406,7 @@ fn test_cp_arg_backup_arg_first() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -424,7 +424,7 @@ fn test_cp_arg_suffix() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}.bak", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}.bak")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -442,7 +442,7 @@ fn test_cp_arg_suffix_hyphen_value() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}-v", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}-v")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -461,7 +461,7 @@ fn test_cp_custom_backup_suffix_via_env() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}{}", TEST_HOW_ARE_YOU_SOURCE, suffix)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}{suffix}")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -478,7 +478,7 @@ fn test_cp_backup_numbered_with_t() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}.~1~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -495,7 +495,7 @@ fn test_cp_backup_numbered() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}.~1~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -512,7 +512,7 @@ fn test_cp_backup_existing() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -529,7 +529,7 @@ fn test_cp_backup_nil() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -537,7 +537,7 @@ fn test_cp_backup_nil() {
|
|||
#[test]
|
||||
fn test_cp_numbered_if_existing_backup_existing() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
let existing_backup = &format!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE);
|
||||
let existing_backup = &format!("{TEST_HOW_ARE_YOU_SOURCE}.~1~");
|
||||
at.touch(existing_backup);
|
||||
|
||||
ucmd.arg("--backup=existing")
|
||||
|
|
@ -549,7 +549,7 @@ fn test_cp_numbered_if_existing_backup_existing() {
|
|||
assert!(at.file_exists(TEST_HOW_ARE_YOU_SOURCE));
|
||||
assert!(at.file_exists(existing_backup));
|
||||
assert_eq!(
|
||||
at.read(&format!("{}.~2~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}.~2~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -557,7 +557,7 @@ fn test_cp_numbered_if_existing_backup_existing() {
|
|||
#[test]
|
||||
fn test_cp_numbered_if_existing_backup_nil() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
let existing_backup = &format!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE);
|
||||
let existing_backup = &format!("{TEST_HOW_ARE_YOU_SOURCE}.~1~");
|
||||
|
||||
at.touch(existing_backup);
|
||||
ucmd.arg("--backup=nil")
|
||||
|
|
@ -569,7 +569,7 @@ fn test_cp_numbered_if_existing_backup_nil() {
|
|||
assert!(at.file_exists(TEST_HOW_ARE_YOU_SOURCE));
|
||||
assert!(at.file_exists(existing_backup));
|
||||
assert_eq!(
|
||||
at.read(&format!("{}.~2~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}.~2~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -586,7 +586,7 @@ fn test_cp_backup_simple() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -594,15 +594,14 @@ fn test_cp_backup_simple() {
|
|||
#[test]
|
||||
fn test_cp_backup_simple_protect_source() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
let source = format!("{}~", TEST_HELLO_WORLD_SOURCE);
|
||||
let source = format!("{TEST_HELLO_WORLD_SOURCE}~");
|
||||
at.touch(&source);
|
||||
ucmd.arg("--backup=simple")
|
||||
.arg(&source)
|
||||
.arg(TEST_HELLO_WORLD_SOURCE)
|
||||
.fails()
|
||||
.stderr_only(format!(
|
||||
"cp: backing up '{}' might destroy source; '{}' not copied\n",
|
||||
TEST_HELLO_WORLD_SOURCE, source,
|
||||
"cp: backing up '{TEST_HELLO_WORLD_SOURCE}' might destroy source; '{source}' not copied\n",
|
||||
));
|
||||
|
||||
assert_eq!(at.read(TEST_HELLO_WORLD_SOURCE), "Hello, World!\n");
|
||||
|
|
@ -621,7 +620,7 @@ fn test_cp_backup_never() {
|
|||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert_eq!(
|
||||
at.read(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)),
|
||||
at.read(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -637,7 +636,7 @@ fn test_cp_backup_none() {
|
|||
.no_stderr();
|
||||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert!(!at.file_exists(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)));
|
||||
assert!(!at.file_exists(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -651,7 +650,7 @@ fn test_cp_backup_off() {
|
|||
.no_stderr();
|
||||
|
||||
assert_eq!(at.read(TEST_HOW_ARE_YOU_SOURCE), "Hello, World!\n");
|
||||
assert!(!at.file_exists(&format!("{}~", TEST_HOW_ARE_YOU_SOURCE)));
|
||||
assert!(!at.file_exists(&format!("{TEST_HOW_ARE_YOU_SOURCE}~")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -801,7 +800,7 @@ fn test_cp_strip_trailing_slashes() {
|
|||
|
||||
//using --strip-trailing-slashes option
|
||||
ucmd.arg("--strip-trailing-slashes")
|
||||
.arg(format!("{}/", TEST_HELLO_WORLD_SOURCE))
|
||||
.arg(format!("{TEST_HELLO_WORLD_SOURCE}/"))
|
||||
.arg(TEST_HELLO_WORLD_DEST)
|
||||
.succeeds();
|
||||
|
||||
|
|
@ -820,8 +819,7 @@ fn test_cp_parents() {
|
|||
|
||||
assert_eq!(
|
||||
at.read(&format!(
|
||||
"{}/{}",
|
||||
TEST_COPY_TO_FOLDER, TEST_COPY_FROM_FOLDER_FILE
|
||||
"{TEST_COPY_TO_FOLDER}/{TEST_COPY_FROM_FOLDER_FILE}"
|
||||
)),
|
||||
"Hello, World!\n"
|
||||
);
|
||||
|
|
@ -839,16 +837,12 @@ fn test_cp_parents_multiple_files() {
|
|||
|
||||
assert_eq!(
|
||||
at.read(&format!(
|
||||
"{}/{}",
|
||||
TEST_COPY_TO_FOLDER, TEST_COPY_FROM_FOLDER_FILE
|
||||
"{TEST_COPY_TO_FOLDER}/{TEST_COPY_FROM_FOLDER_FILE}"
|
||||
)),
|
||||
"Hello, World!\n"
|
||||
);
|
||||
assert_eq!(
|
||||
at.read(&format!(
|
||||
"{}/{}",
|
||||
TEST_COPY_TO_FOLDER, TEST_HOW_ARE_YOU_SOURCE
|
||||
)),
|
||||
at.read(&format!("{TEST_COPY_TO_FOLDER}/{TEST_HOW_ARE_YOU_SOURCE}")),
|
||||
"How are you?\n"
|
||||
);
|
||||
}
|
||||
|
|
@ -1350,7 +1344,7 @@ fn test_cp_no_preserve_timestamps() {
|
|||
let result = scene2.cmd("ls").arg("-al").arg(at.subdir).run();
|
||||
|
||||
println!("ls dest {}", result.stdout_str());
|
||||
println!("creation {:?} / {:?}", creation, creation2);
|
||||
println!("creation {creation:?} / {creation2:?}");
|
||||
|
||||
assert_ne!(creation, creation2);
|
||||
let res = creation.elapsed().unwrap() - creation2.elapsed().unwrap();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue