From e8b6561d4c71dac3522f1c9d1dcaf9f69950e17d Mon Sep 17 00:00:00 2001 From: Gabriele Belluardo Date: Tue, 17 Jun 2025 00:06:01 +0200 Subject: [PATCH] fix(clippy): needless_continue --- src/uu/dd/src/dd.rs | 4 ++-- src/uu/expand/src/expand.rs | 1 - src/uu/head/src/parse.rs | 1 - src/uu/head/src/take.rs | 2 +- src/uu/ls/src/ls.rs | 1 - src/uu/shred/src/shred.rs | 1 - src/uu/sum/src/sum.rs | 4 ++-- src/uu/tail/src/follow/watch.rs | 2 +- src/uu/tail/src/tail.rs | 2 +- src/uu/wc/src/count_fast.rs | 4 ++-- src/uucore/src/lib/features/checksum.rs | 4 ++-- src/uucore/src/lib/features/entries.rs | 1 - 12 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs index c0e37263f..7351ded39 100644 --- a/src/uu/dd/src/dd.rs +++ b/src/uu/dd/src/dd.rs @@ -437,7 +437,7 @@ impl Read for Input<'_> { } } Ok(len) => return Ok(len), - Err(e) if e.kind() == io::ErrorKind::Interrupted => continue, + Err(e) if e.kind() == io::ErrorKind::Interrupted => (), Err(_) if self.settings.iconv.noerror => return Ok(base_idx), Err(e) => return Err(e), } @@ -861,7 +861,7 @@ impl<'a> Output<'a> { return Ok(base_idx); } } - Err(e) if e.kind() == io::ErrorKind::Interrupted => continue, + Err(e) if e.kind() == io::ErrorKind::Interrupted => (), Err(e) => return Err(e), } } diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs index 2e8d1b296..c8551115e 100644 --- a/src/uu/expand/src/expand.rs +++ b/src/uu/expand/src/expand.rs @@ -464,7 +464,6 @@ fn expand(options: &Options) -> UResult<()> { Err(e) => { show_error!("{e}"); set_exit_code(1); - continue; } } } diff --git a/src/uu/head/src/parse.rs b/src/uu/head/src/parse.rs index a4ce6e710..aa2a56f7d 100644 --- a/src/uu/head/src/parse.rs +++ b/src/uu/head/src/parse.rs @@ -26,7 +26,6 @@ pub fn parse_obsolete(src: &str) -> Option, ParseError>> { } else if c == '+' && plus_possible { plus_possible = false; num_start += 1; - continue; } else { num_end = n; last_char = c; diff --git a/src/uu/head/src/take.rs b/src/uu/head/src/take.rs index 1a303bbd4..de8831cc9 100644 --- a/src/uu/head/src/take.rs +++ b/src/uu/head/src/take.rs @@ -31,7 +31,7 @@ impl TakeAllBuffer { self.buffer.truncate(n); return Ok(n); } - Err(e) if e.kind() == ErrorKind::Interrupted => continue, + Err(e) if e.kind() == ErrorKind::Interrupted => (), Err(e) => return Err(e), } } diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index a9c9597bb..7301766b7 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -2366,7 +2366,6 @@ fn enter_directory( err, e.command_line )); - continue; } Ok(rd) => { if listed_ancestors diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index 0cfafd862..691e36bc2 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -138,7 +138,6 @@ impl Iterator for FilenameIter { if *index == NAME_CHARSET.len() - 1 { // Carry the 1 *index = 0; - continue; } else { *index += 1; return Some(ret); diff --git a/src/uu/sum/src/sum.rs b/src/uu/sum/src/sum.rs index 41ab702e5..21c35c76c 100644 --- a/src/uu/sum/src/sum.rs +++ b/src/uu/sum/src/sum.rs @@ -29,7 +29,7 @@ fn bsd_sum(mut reader: impl Read) -> std::io::Result<(usize, u16)> { rotated.wrapping_add(u16::from(byte)) }); } - Err(e) if e.kind() == ErrorKind::Interrupted => continue, + Err(e) if e.kind() == ErrorKind::Interrupted => (), Err(e) => return Err(e), } } @@ -53,7 +53,7 @@ fn sysv_sum(mut reader: impl Read) -> std::io::Result<(usize, u16)> { .iter() .fold(ret, |acc, &byte| acc.wrapping_add(u32::from(byte))); } - Err(e) if e.kind() == ErrorKind::Interrupted => continue, + Err(e) if e.kind() == ErrorKind::Interrupted => (), Err(e) => return Err(e), } } diff --git a/src/uu/tail/src/follow/watch.rs b/src/uu/tail/src/follow/watch.rs index 87db5aa02..19c419cd4 100644 --- a/src/uu/tail/src/follow/watch.rs +++ b/src/uu/tail/src/follow/watch.rs @@ -284,7 +284,7 @@ impl Observer { if let Some(watcher_rx) = &mut self.watcher_rx { for input in inputs { match input.kind() { - InputKind::Stdin => continue, + InputKind::Stdin => (), InputKind::File(path) => { #[cfg(all(unix, not(target_os = "linux")))] if !path.is_file() { diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs index 63dd7389b..aa74f08c6 100644 --- a/src/uu/tail/src/tail.rs +++ b/src/uu/tail/src/tail.rs @@ -393,7 +393,7 @@ fn forwards_thru_file( } total += n; } - Err(e) if e.kind() == ErrorKind::Interrupted => continue, + Err(e) if e.kind() == ErrorKind::Interrupted => (), Err(e) => return Err(e), } } diff --git a/src/uu/wc/src/count_fast.rs b/src/uu/wc/src/count_fast.rs index a8f5dd432..d70ba9f7c 100644 --- a/src/uu/wc/src/count_fast.rs +++ b/src/uu/wc/src/count_fast.rs @@ -192,7 +192,7 @@ pub(crate) fn count_bytes_fast(handle: &mut T) -> (usize, Opti Ok(n) => { byte_count += n; } - Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, + Err(ref e) if e.kind() == ErrorKind::Interrupted => (), Err(e) => return (byte_count, Some(e)), } } @@ -246,7 +246,7 @@ pub(crate) fn count_bytes_chars_and_lines_fast< total.lines += bytecount::count(&buf[..n], b'\n'); } } - Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, + Err(ref e) if e.kind() == ErrorKind::Interrupted => (), Err(e) => return (total, Some(e)), } } diff --git a/src/uucore/src/lib/features/checksum.rs b/src/uucore/src/lib/features/checksum.rs index ed615baa9..70cd6796c 100644 --- a/src/uucore/src/lib/features/checksum.rs +++ b/src/uucore/src/lib/features/checksum.rs @@ -1063,7 +1063,7 @@ fn process_checksum_file( } Err(CantOpenFile | FileIsDirectory) => res.failed_open_file += 1, Err(FileNotFound) if !opts.ignore_missing => res.failed_open_file += 1, - _ => continue, + _ => (), }; } @@ -1132,7 +1132,7 @@ where match process_checksum_file(filename_input, algo_name_input, length_input, opts) { Err(UError(e)) => return Err(e), Err(Failed | CantOpenChecksumFile) => failed = true, - Ok(_) => continue, + Ok(_) => (), } } diff --git a/src/uucore/src/lib/features/entries.rs b/src/uucore/src/lib/features/entries.rs index 9fa7b94ab..ccf4b3751 100644 --- a/src/uucore/src/lib/features/entries.rs +++ b/src/uucore/src/lib/features/entries.rs @@ -82,7 +82,6 @@ pub fn get_groups() -> IOResult> { let err = IOError::last_os_error(); if err.raw_os_error() == Some(libc::EINVAL) { // Number of groups has increased, retry - continue; } else { return Err(err); }