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

clippy: fix warnings introduced by Rust 1.74

Browse source
This commit is contained in:
Daniel Hofstetter 2023-11-16 16:02:38 +01:00
parent 7ff4cb3f4e
commit 2f9fcf73fa
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/more/src/more.rs
View file

@ -88,7 +88,7 @@ impl Options {
#[uucore::main] #[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let args = args.collect_lossy(); let args = args.collect_lossy();
let matches = match uu_app().try_get_matches_from(&args) { let matches = match uu_app().try_get_matches_from(args) {
Ok(m) => m, Ok(m) => m,
Err(e) => return Err(e.into()), Err(e) => return Err(e.into()),
}; };

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

@ -1470,7 +1470,7 @@ fn test_seek_output_fifo() {
.args(&["count=0", "seek=1", "of=fifo", "status=noxfer"]) .args(&["count=0", "seek=1", "of=fifo", "status=noxfer"])
.run_no_wait(); .run_no_wait();
std::fs::write(at.plus("fifo"), &vec![0; 512]).unwrap(); std::fs::write(at.plus("fifo"), vec![0; 512]).unwrap();
child child
.wait() .wait()
@ -1492,7 +1492,7 @@ fn test_skip_input_fifo() {
.args(&["count=0", "skip=1", "if=fifo", "status=noxfer"]) .args(&["count=0", "skip=1", "if=fifo", "status=noxfer"])
.run_no_wait(); .run_no_wait();
std::fs::write(at.plus("fifo"), &vec![0; 512]).unwrap(); std::fs::write(at.plus("fifo"), vec![0; 512]).unwrap();
child child
.wait() .wait()

6
tests/by-util/test_ls.rs
View file

@ -994,9 +994,9 @@ fn test_ls_long() {
fn test_ls_long_format() { fn test_ls_long_format() {
let scene = TestScenario::new(util_name!()); let scene = TestScenario::new(util_name!());
let at = &scene.fixtures; let at = &scene.fixtures;
at.mkdir(&at.plus_as_string("test-long-dir")); at.mkdir(at.plus_as_string("test-long-dir"));
at.touch(at.plus_as_string("test-long-dir/test-long-file")); at.touch(at.plus_as_string("test-long-dir/test-long-file"));
at.mkdir(&at.plus_as_string("test-long-dir/test-long-dir")); at.mkdir(at.plus_as_string("test-long-dir/test-long-dir"));
for arg in LONG_ARGS { for arg in LONG_ARGS {
// Assuming sane username do not have spaces within them. // Assuming sane username do not have spaces within them.
@ -1971,7 +1971,7 @@ fn test_ls_color() {
.join("nested_dir") .join("nested_dir")
.to_string_lossy() .to_string_lossy()
.to_string(); .to_string();
at.mkdir(&nested_dir); at.mkdir(nested_dir);
at.mkdir("z"); at.mkdir("z");
let nested_file = Path::new("a") let nested_file = Path::new("a")
.join("nested_file") .join("nested_file")

6
tests/by-util/test_users.rs
View file

@ -21,11 +21,9 @@ fn test_users_check_name() {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let util_name = util_name!(); let util_name = util_name!();
#[cfg(target_vendor = "apple")] #[cfg(target_vendor = "apple")]
let util_name = format!("g{}", util_name!()); let util_name = &format!("g{}", util_name!());
// note: clippy::needless_borrow *false positive* let expected = TestScenario::new(util_name)
#[allow(clippy::needless_borrow)]
let expected = TestScenario::new(&util_name)
.cmd(util_name) .cmd(util_name)
.env("LC_ALL", "C") .env("LC_ALL", "C")
.succeeds() .succeeds()