Fix some clippy warnings

This commit is contained in:
Sylvestre Ledru
2023-08-21 08:41:40 +02:00
parent 682f488720
commit 7c9f4ba92a
23 changed files with 50 additions and 55 deletions
+3 -3
View File
@@ -192,7 +192,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
NumberingMode::None
};
let show_nonprint = vec![
let show_nonprint = [
options::SHOW_ALL.to_owned(),
options::SHOW_NONPRINTING_ENDS.to_owned(),
options::SHOW_NONPRINTING_TABS.to_owned(),
@@ -201,7 +201,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
.iter()
.any(|v| matches.get_flag(v));
let show_ends = vec![
let show_ends = [
options::SHOW_ENDS.to_owned(),
options::SHOW_ALL.to_owned(),
options::SHOW_NONPRINTING_ENDS.to_owned(),
@@ -209,7 +209,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
.iter()
.any(|v| matches.get_flag(v));
let show_tabs = vec![
let show_tabs = [
options::SHOW_ALL.to_owned(),
options::SHOW_TABS.to_owned(),
options::SHOW_NONPRINTING_TABS.to_owned(),
+8 -8
View File
@@ -438,25 +438,25 @@ mod tests {
fn test_extract_negative_modes() {
// "chmod -w -r file" becomes "chmod -w,-r file". clap does not accept "-w,-r" as MODE.
// Therefore, "w" is added as pseudo mode to pass clap.
let (c, a) = extract_negative_modes(vec!["-w", "-r", "file"].iter().map(OsString::from));
let (c, a) = extract_negative_modes(["-w", "-r", "file"].iter().map(OsString::from));
assert_eq!(c, Some("-w,-r".to_string()));
assert_eq!(a, vec!["w", "file"]);
assert_eq!(a, ["w", "file"]);
// "chmod -w file -r" becomes "chmod -w,-r file". clap does not accept "-w,-r" as MODE.
// Therefore, "w" is added as pseudo mode to pass clap.
let (c, a) = extract_negative_modes(vec!["-w", "file", "-r"].iter().map(OsString::from));
let (c, a) = extract_negative_modes(["-w", "file", "-r"].iter().map(OsString::from));
assert_eq!(c, Some("-w,-r".to_string()));
assert_eq!(a, vec!["w", "file"]);
assert_eq!(a, ["w", "file"]);
// "chmod -w -- -r file" becomes "chmod -w -r file", where "-r" is interpreted as file.
// Again, "w" is needed as pseudo mode.
let (c, a) = extract_negative_modes(vec!["-w", "--", "-r", "f"].iter().map(OsString::from));
let (c, a) = extract_negative_modes(["-w", "--", "-r", "f"].iter().map(OsString::from));
assert_eq!(c, Some("-w".to_string()));
assert_eq!(a, vec!["w", "--", "-r", "f"]);
assert_eq!(a, ["w", "--", "-r", "f"]);
// "chmod -- -r file" becomes "chmod -r file".
let (c, a) = extract_negative_modes(vec!["--", "-r", "file"].iter().map(OsString::from));
let (c, a) = extract_negative_modes(["--", "-r", "file"].iter().map(OsString::from));
assert_eq!(c, None);
assert_eq!(a, vec!["--", "-r", "file"]);
assert_eq!(a, ["--", "-r", "file"]);
}
}
+1 -3
View File
@@ -168,9 +168,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
println!("{s}");
Ok(())
}
Err(s) => {
return Err(USimpleError::new(1, s));
}
Err(s) => Err(USimpleError::new(1, s)),
}
}
+1 -1
View File
@@ -550,7 +550,7 @@ fn auditid() {
println!("asid={}", auditinfo.ai_asid);
}
fn id_print(state: &mut State, groups: &[u32]) {
fn id_print(state: &State, groups: &[u32]) {
let uid = state.ids.as_ref().unwrap().uid;
let gid = state.ids.as_ref().unwrap().gid;
let euid = state.ids.as_ref().unwrap().euid;
+1 -1
View File
@@ -619,7 +619,7 @@ fn copy_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> UR
if !target_dir.is_dir() {
return Err(InstallError::TargetDirIsntDir(target_dir.to_path_buf()).into());
}
for sourcepath in files.iter() {
for sourcepath in files {
if let Err(err) = sourcepath
.metadata()
.map_err_context(|| format!("cannot stat {}", sourcepath.quote()))
+4 -6
View File
@@ -101,12 +101,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
matches.get_one::<u64>("major"),
matches.get_one::<u64>("minor"),
) {
(_, None) | (None, _) => {
return Err(UUsageError::new(
1,
"Special files require major and minor device numbers.",
));
}
(_, None) | (None, _) => Err(UUsageError::new(
1,
"Special files require major and minor device numbers.",
)),
(Some(&major), Some(&minor)) => {
let dev = makedev(major, minor);
let exit_code = match file_type {
+1 -1
View File
@@ -364,7 +364,7 @@ fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> UR
None
};
for sourcepath in files.iter() {
for sourcepath in files {
if let Some(ref pb) = count_progress {
pb.set_message(sourcepath.to_string_lossy().to_string());
}
+1 -1
View File
@@ -82,7 +82,7 @@ pub fn format_ascii_dump(bytes: &[u8]) -> String {
let mut result = String::new();
result.push('>');
for c in bytes.iter() {
for c in bytes {
if *c >= 0x20 && *c <= 0x7e {
result.push_str(C_CHARS[*c as usize]);
} else {
+2 -2
View File
@@ -54,7 +54,7 @@ pub fn check(path: &OsStr, settings: &GlobalSettings) -> UResult<()> {
let mut prev_chunk: Option<Chunk> = None;
let mut line_idx = 0;
for chunk in loaded_receiver.iter() {
for chunk in loaded_receiver {
line_idx += 1;
if let Some(prev_chunk) = prev_chunk.take() {
// Check if the first element of the new chunk is greater than the last
@@ -107,7 +107,7 @@ fn reader(
settings: &GlobalSettings,
) -> UResult<()> {
let mut carry_over = vec![];
for recycled_chunk in receiver.iter() {
for recycled_chunk in receiver {
let should_continue = chunks::read(
sender,
recycled_chunk,
+1 -1
View File
@@ -211,7 +211,7 @@ fn reader(
settings: &GlobalSettings,
separator: u8,
) -> UResult<()> {
for (file_idx, recycled_chunk) in recycled_receiver.iter() {
for (file_idx, recycled_chunk) in recycled_receiver {
if let Some(ReaderFile {
file,
sender,
+1 -1
View File
@@ -130,7 +130,7 @@ fn set_command_env(command: &mut process::Command, buffer_name: &str, buffer_typ
}
}
fn get_preload_env(tmp_dir: &mut TempDir) -> io::Result<(String, PathBuf)> {
fn get_preload_env(tmp_dir: &TempDir) -> io::Result<(String, PathBuf)> {
let (preload, extension) = preload_strings();
let inject_path = tmp_dir.path().join("libstdbuf").with_extension(extension);
+2 -2
View File
@@ -33,7 +33,7 @@ fn bsd_sum(mut reader: Box<dyn Read>) -> (usize, u16) {
match reader.read(&mut buf) {
Ok(n) if n != 0 => {
bytes_read += n;
for &byte in buf[..n].iter() {
for &byte in &buf[..n] {
checksum = checksum.rotate_right(1);
checksum = checksum.wrapping_add(u16::from(byte));
}
@@ -56,7 +56,7 @@ fn sysv_sum(mut reader: Box<dyn Read>) -> (usize, u16) {
match reader.read(&mut buf) {
Ok(n) if n != 0 => {
bytes_read += n;
for &byte in buf[..n].iter() {
for &byte in &buf[..n] {
ret = ret.wrapping_add(u32::from(byte));
}
}
+1 -1
View File
@@ -173,7 +173,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let path = Path::new(&f);
if let Err(e) = open(path, OFlag::O_NONBLOCK, Mode::empty()) {
if e != Errno::EACCES || (e == Errno::EACCES && path.is_dir()) {
return e.map_err_context(|| format!("error opening {}", f.quote()))?;
e.map_err_context(|| format!("error opening {}", f.quote()))?;
}
}
}
+1 -1
View File
@@ -495,7 +495,7 @@ impl LinesChunk {
fn calculate_bytes_offset_from(&self, offset: usize) -> usize {
let mut lines_offset = offset;
let mut bytes_offset = 0;
for byte in self.get_buffer().iter() {
for byte in self.get_buffer() {
if lines_offset == 0 {
break;
}
+1 -1
View File
@@ -686,7 +686,7 @@ fn compute_number_width(inputs: &Inputs, settings: &Settings) -> usize {
let mut minimum_width = 1;
let mut total: u64 = 0;
for input in inputs.iter() {
for input in inputs {
match input {
Input::Stdin(_) => minimum_width = MINIMUM_WIDTH,
Input::Path(path) => {
+3 -3
View File
@@ -845,7 +845,7 @@ mod tests {
let path1 = temp_file.path();
let path2 = temp_file.path();
assert_eq!(are_hardlinks_to_same_file(&path1, &path2), true);
assert!(are_hardlinks_to_same_file(&path1, &path2));
}
#[cfg(unix)]
@@ -860,7 +860,7 @@ mod tests {
let path1 = temp_file1.path();
let path2 = temp_file2.path();
assert_eq!(are_hardlinks_to_same_file(&path1, &path2), false);
assert!(are_hardlinks_to_same_file(&path1, &path2));
}
#[cfg(unix)]
@@ -873,6 +873,6 @@ mod tests {
let path2 = temp_file.path().with_extension("hardlink");
fs::hard_link(&path1, &path2).unwrap();
assert_eq!(are_hardlinks_to_same_file(&path1, &path2), true);
assert!(are_hardlinks_to_same_file(&path1, &path2));
}
}
+4 -4
View File
@@ -2022,12 +2022,12 @@ fn test_cp_reflink_always_override() {
const USERDIR: &str = "dir/";
const MOUNTPOINT: &str = "mountpoint/";
let src1_path: &str = &vec![MOUNTPOINT, USERDIR, "src1"].concat();
let src2_path: &str = &vec![MOUNTPOINT, USERDIR, "src2"].concat();
let dst_path: &str = &vec![MOUNTPOINT, USERDIR, "dst"].concat();
let src1_path: &str = &[MOUNTPOINT, USERDIR, "src1"].concat();
let src2_path: &str = &[MOUNTPOINT, USERDIR, "src2"].concat();
let dst_path: &str = &[MOUNTPOINT, USERDIR, "dst"].concat();
scene.fixtures.mkdir(ROOTDIR);
scene.fixtures.mkdir(vec![ROOTDIR, USERDIR].concat());
scene.fixtures.mkdir([ROOTDIR, USERDIR].concat());
// Setup:
// Because neither `mkfs.btrfs` not btrfs `mount` options allow us to have a mountpoint owned
+1 -2
View File
@@ -173,7 +173,6 @@ fn test_random() {
break;
}
}
let factor = factor;
match product.checked_mul(factor) {
Some(p) => {
@@ -317,7 +316,7 @@ fn run(input_string: &[u8], output_string: &[u8]) {
fn test_primes_with_exponents() {
let mut input_string = String::new();
let mut output_string = String::new();
for primes in PRIMES_BY_BITS.iter() {
for primes in PRIMES_BY_BITS {
for &prime in *primes {
input_string.push_str(&(format!("{prime} "))[..]);
output_string.push_str(&(format!("{prime}: {prime}\n"))[..]);
+1 -1
View File
@@ -58,7 +58,7 @@ fn test_link_one_argument() {
#[test]
fn test_link_three_arguments() {
let (_, mut ucmd) = at_and_ucmd!();
let arguments = vec![
let arguments = [
"test_link_argument1",
"test_link_argument2",
"test_link_argument3",
+1 -1
View File
@@ -1278,7 +1278,7 @@ fn test_mv_verbose() {
#[test]
#[cfg(any(target_os = "linux", target_os = "android"))] // mkdir does not support -m on windows. Freebsd doesn't return a permission error either.
#[cfg(features = "mkdir")]
#[cfg(feature = "mkdir")]
fn test_mv_permission_error() {
let scene = TestScenario::new("mkdir");
let folder1 = "bar";

Some files were not shown because too many files have changed in this diff Show More