mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-08-31 07:47:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Clippy fixes in multiple crates

Browse source
This commit is contained in:
Jeffrey Finkelstein 2022-08-21 22:48:09 -04:00
parent 5a726e1ab3
commit 8458bf1387
10 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/by-util/test_cp.rs
View file

@ -73,7 +73,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]
@ -344,7 +344,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"
);
}
@ -360,7 +360,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"
);
}
@ -376,7 +376,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"
);
}
@ -394,7 +394,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!("{}.bak", TEST_HOW_ARE_YOU_SOURCE)),
"How are you?\n"
);
}
@ -412,7 +412,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!("{}-v", TEST_HOW_ARE_YOU_SOURCE)),
"How are you?\n"
);
}
@ -431,7 +431,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"
);
}
@ -448,7 +448,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!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE)),
"How are you?\n"
);
}
@ -465,7 +465,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!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE)),
"How are you?\n"
);
}
@ -482,7 +482,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"
);
}
@ -499,7 +499,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"
);
}
@ -507,7 +507,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!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE);
at.touch(existing_backup);
ucmd.arg("--backup=existing")
@ -519,7 +519,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!("{}.~2~", TEST_HOW_ARE_YOU_SOURCE)),
"How are you?\n"
);
}
@ -527,7 +527,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!("{}.~1~", TEST_HOW_ARE_YOU_SOURCE);
at.touch(existing_backup);
ucmd.arg("--backup=nil")
@ -539,7 +539,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!("{}.~2~", TEST_HOW_ARE_YOU_SOURCE)),
"How are you?\n"
);
}
@ -556,7 +556,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"
);
}
@ -591,7 +591,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"
);
}

4
tests/by-util/test_install.rs
View file

@ -996,7 +996,7 @@ fn test_install_backup_numbered_if_existing_backup_existing() {
assert!(at.file_exists(file_a));
assert!(at.file_exists(file_b));
assert!(at.file_exists(file_b_backup));
assert!(at.file_exists(&*format!("{}.~2~", file_b)));
assert!(at.file_exists(&format!("{}.~2~", file_b)));
}
#[test]
@ -1022,7 +1022,7 @@ fn test_install_backup_numbered_if_existing_backup_nil() {
assert!(at.file_exists(file_a));
assert!(at.file_exists(file_b));
assert!(at.file_exists(file_b_backup));
assert!(at.file_exists(&*format!("{}.~2~", file_b)));
assert!(at.file_exists(&format!("{}.~2~", file_b)));
}
#[test]

4
tests/by-util/test_mv.rs
View file

@ -475,7 +475,7 @@ fn test_mv_numbered_if_existing_backup_existing() {
assert!(at.file_exists(file_b));
assert!(at.file_exists(file_b_backup));
assert!(at.file_exists(&*format!("{}.~2~", file_b)));
assert!(at.file_exists(&format!("{}.~2~", file_b)));
}
#[test]
@ -496,7 +496,7 @@ fn test_mv_numbered_if_existing_backup_nil() {
assert!(at.file_exists(file_b));
assert!(at.file_exists(file_b_backup));
assert!(at.file_exists(&*format!("{}.~2~", file_b)));
assert!(at.file_exists(&format!("{}.~2~", file_b)));
}
#[test]

10
tests/by-util/test_split.rs
View file

@ -257,14 +257,12 @@ fn test_filter() {
// assert all characters are 'i' / no character is not 'i'
// (assert that command succeeded)
let glob = Glob::new(&at, ".", r"x[[:alpha:]][[:alpha:]]$");
assert!(
glob.collate().iter().find(|&&c| {
// is not i
c != (b'i')
assert!(!glob.collate().iter().any(|&c| {
// is not i
c != (b'i')
// is not newline
&& c != (b'\n')
}) == None
);
}));
}
#[test]