From 9bb725cefc63145c722025c2ff216fee63bc30c3 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 28 Dec 2023 17:44:23 +0100 Subject: [PATCH] clippy: fix warnings introduced by Rust 1.75 --- src/uu/csplit/src/patterns.rs | 6 +++--- src/uu/factor/src/factor.rs | 1 + src/uu/kill/src/kill.rs | 2 +- tests/by-util/test_ls.rs | 2 +- tests/by-util/test_test.rs | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/uu/csplit/src/patterns.rs b/src/uu/csplit/src/patterns.rs index 8e7b76e6b..6e7483b7f 100644 --- a/src/uu/csplit/src/patterns.rs +++ b/src/uu/csplit/src/patterns.rs @@ -196,7 +196,7 @@ mod tests { .collect(); let patterns = get_patterns(input.as_slice()).unwrap(); assert_eq!(patterns.len(), 3); - match patterns.get(0) { + match patterns.first() { Some(Pattern::UpToLine(24, ExecutePattern::Times(1))) => (), _ => panic!("expected UpToLine pattern"), }; @@ -227,7 +227,7 @@ mod tests { .collect(); let patterns = get_patterns(input.as_slice()).unwrap(); assert_eq!(patterns.len(), 5); - match patterns.get(0) { + match patterns.first() { Some(Pattern::UpToMatch(reg, 0, ExecutePattern::Times(1))) => { let parsed_reg = format!("{reg}"); assert_eq!(parsed_reg, "test1.*end$"); @@ -281,7 +281,7 @@ mod tests { .collect(); let patterns = get_patterns(input.as_slice()).unwrap(); assert_eq!(patterns.len(), 5); - match patterns.get(0) { + match patterns.first() { Some(Pattern::SkipToMatch(reg, 0, ExecutePattern::Times(1))) => { let parsed_reg = format!("{reg}"); assert_eq!(parsed_reg, "test1.*end$"); diff --git a/src/uu/factor/src/factor.rs b/src/uu/factor/src/factor.rs index a7e848bb8..d7899a7e6 100644 --- a/src/uu/factor/src/factor.rs +++ b/src/uu/factor/src/factor.rs @@ -3,6 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. +#![allow(clippy::items_after_test_module)] use smallvec::SmallVec; use std::cell::RefCell; use std::fmt; diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs index f353fd7ca..87de0ff54 100644 --- a/src/uu/kill/src/kill.rs +++ b/src/uu/kill/src/kill.rs @@ -71,7 +71,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { table(); Ok(()) } - Mode::List => list(pids_or_signals.get(0)), + Mode::List => list(pids_or_signals.first()), } } diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index 5da8912e3..72a303ef3 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -4139,7 +4139,7 @@ fn test_ls_hyperlink_dirs() { assert!(result .stdout_str() .lines() - .nth(0) + .next() .unwrap() .contains(&format!("{path}{separator}{dir_a}\x07{dir_a}\x1b]8;;\x07:"))); assert_eq!(result.stdout_str().lines().nth(1).unwrap(), ""); diff --git a/tests/by-util/test_test.rs b/tests/by-util/test_test.rs index 277e4622a..1999634ef 100644 --- a/tests/by-util/test_test.rs +++ b/tests/by-util/test_test.rs @@ -696,7 +696,7 @@ fn test_file_owned_by_egid() { if user_gid != file_gid { let file_uid = metadata.uid(); let path = CString::new(at.plus("regular_file").as_os_str().as_bytes()).expect("bad path"); - let r = unsafe { libc::chown(path.as_ptr().into(), file_uid, user_gid) }; + let r = unsafe { libc::chown(path.as_ptr(), file_uid, user_gid) }; assert_ne!(r, -1); }