1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00

Run cargo fmt on the tree

This commit is contained in:
Sylvestre Ledru 2025-03-24 21:04:32 +01:00
parent 36dd968c9a
commit a85539f530
189 changed files with 841 additions and 782 deletions

View file

@ -1337,13 +1337,15 @@ fn test_cp_deref() {
.join(TEST_COPY_TO_FOLDER)
.join(TEST_HELLO_WORLD_SOURCE_SYMLINK);
// unlike -P/--no-deref, we expect a file, not a link
assert!(at.file_exists(
path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
));
assert!(
at.file_exists(
path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
)
);
// Check the content of the destination file that was copied.
assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
let path_to_check = path_to_new_symlink.to_str().unwrap();
@ -1374,13 +1376,15 @@ fn test_cp_no_deref() {
.subdir
.join(TEST_COPY_TO_FOLDER)
.join(TEST_HELLO_WORLD_SOURCE_SYMLINK);
assert!(at.is_symlink(
&path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
));
assert!(
at.is_symlink(
&path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
)
);
// Check the content of the destination file that was copied.
assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
let path_to_check = path_to_new_symlink.to_str().unwrap();
@ -1421,14 +1425,16 @@ fn test_cp_no_deref_link_onto_link() {
.succeeds();
// Ensure that the target of the destination was not modified.
assert!(!at
.symlink_metadata(TEST_HELLO_WORLD_DEST)
.file_type()
.is_symlink());
assert!(at
.symlink_metadata(TEST_HELLO_WORLD_DEST_SYMLINK)
.file_type()
.is_symlink());
assert!(
!at.symlink_metadata(TEST_HELLO_WORLD_DEST)
.file_type()
.is_symlink()
);
assert!(
at.symlink_metadata(TEST_HELLO_WORLD_DEST_SYMLINK)
.file_type()
.is_symlink()
);
assert_eq!(at.read(TEST_HELLO_WORLD_DEST_SYMLINK), "Hello, World!\n");
}
@ -2060,13 +2066,15 @@ fn test_cp_deref_folder_to_folder() {
.subdir
.join(TEST_COPY_TO_FOLDER_NEW)
.join(TEST_HELLO_WORLD_SOURCE_SYMLINK);
assert!(at.file_exists(
path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
));
assert!(
at.file_exists(
path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
)
);
let path_to_new = at.subdir.join(TEST_COPY_TO_FOLDER_NEW_FILE);
@ -2156,13 +2164,15 @@ fn test_cp_no_deref_folder_to_folder() {
.subdir
.join(TEST_COPY_TO_FOLDER_NEW)
.join(TEST_HELLO_WORLD_SOURCE_SYMLINK);
assert!(at.is_symlink(
&path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
));
assert!(
at.is_symlink(
&path_to_new_symlink
.clone()
.into_os_string()
.into_string()
.unwrap()
)
);
let path_to_new = at.subdir.join(TEST_COPY_TO_FOLDER_NEW_FILE);
@ -2254,18 +2264,22 @@ fn test_cp_archive_recursive() {
assert!(at.file_exists(at.subdir.join(TEST_COPY_TO_FOLDER_NEW).join("1")));
assert!(at.file_exists(at.subdir.join(TEST_COPY_TO_FOLDER_NEW).join("2")));
assert!(at.is_symlink(
&at.subdir
.join(TEST_COPY_TO_FOLDER_NEW)
.join("1.link")
.to_string_lossy()
));
assert!(at.is_symlink(
&at.subdir
.join(TEST_COPY_TO_FOLDER_NEW)
.join("2.link")
.to_string_lossy()
));
assert!(
at.is_symlink(
&at.subdir
.join(TEST_COPY_TO_FOLDER_NEW)
.join("1.link")
.to_string_lossy()
)
);
assert!(
at.is_symlink(
&at.subdir
.join(TEST_COPY_TO_FOLDER_NEW)
.join("2.link")
.to_string_lossy()
)
);
}
#[test]
@ -3974,13 +3988,17 @@ fn test_cp_seen_file() {
let result = ts.ucmd().arg("a/f").arg("b/f").arg("c").fails();
#[cfg(not(unix))]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c\\f' with 'b/f'"));
assert!(
result
.stderr_str()
.contains("will not overwrite just-created 'c\\f' with 'b/f'")
);
#[cfg(unix)]
assert!(result
.stderr_str()
.contains("will not overwrite just-created 'c/f' with 'b/f'"));
assert!(
result
.stderr_str()
.contains("will not overwrite just-created 'c/f' with 'b/f'")
);
assert!(at.plus("c").join("f").exists());
@ -6073,11 +6091,13 @@ fn test_cp_preserve_xattr_readonly_source() {
);
at.set_readonly(source_file);
assert!(scene
.fixtures
.metadata(source_file)
.permissions()
.readonly());
assert!(
scene
.fixtures
.metadata(source_file)
.permissions()
.readonly()
);
scene
.ucmd()