From 7679e908184e73035079fdf74382d155ce8c8574 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sat, 9 Sep 2023 08:47:08 +0100 Subject: [PATCH] clippy: remove some unnecessary mut removing useless mutability mostly. --- src/uu/cat/src/splice.rs | 2 +- src/uu/cksum/src/cksum.rs | 3 +-- src/uu/env/src/env.rs | 5 ++++- src/uu/hashsum/src/hashsum.rs | 3 +-- src/uu/sort/src/ext_sort.rs | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/uu/cat/src/splice.rs b/src/uu/cat/src/splice.rs index 5a9e8738e..6c2b6d3da 100644 --- a/src/uu/cat/src/splice.rs +++ b/src/uu/cat/src/splice.rs @@ -21,7 +21,7 @@ const BUF_SIZE: usize = 1024 * 16; /// copying or not. False means we don't have to. #[inline] pub(super) fn write_fast_using_splice( - handle: &mut InputHandle, + handle: &InputHandle, write_fd: &impl AsRawFd, ) -> CatResult { let (pipe_rd, pipe_wr) = pipe()?; diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs index 6c9c79582..629bb457f 100644 --- a/src/uu/cksum/src/cksum.rs +++ b/src/uu/cksum/src/cksum.rs @@ -207,8 +207,7 @@ fn digest_read( Ok((digest.result_str(), output_size)) } else { // Assume it's SHAKE. result_str() doesn't work with shake (as of 8/30/2016) - let mut bytes = Vec::new(); - bytes.resize((output_bits + 7) / 8, 0); + let mut bytes = vec![0; (output_bits + 7) / 8]; digest.hash_finalize(&mut bytes); Ok((encode(bytes), output_size)) } diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs index e031e39e3..d7c9687de 100644 --- a/src/uu/env/src/env.rs +++ b/src/uu/env/src/env.rs @@ -101,7 +101,7 @@ fn load_config_file(opts: &mut Options) -> UResult<()> { #[cfg(not(windows))] #[allow(clippy::ptr_arg)] -fn build_command<'a, 'b>(args: &'a mut Vec<&'b str>) -> (Cow<'b, str>, &'a [&'b str]) { +fn build_command<'a, 'b>(args: &'a Vec<&'b str>) -> (Cow<'b, str>, &'a [&'b str]) { let progname = Cow::from(args[0]); (progname, &args[1..]) } @@ -303,7 +303,10 @@ fn run_env(args: impl uucore::Args) -> UResult<()> { print_env(opts.line_ending); } else { // we need to execute a command + #[cfg(windows)] let (prog, args) = build_command(&mut opts.program); + #[cfg(not(windows))] + let (prog, args) = build_command(&opts.program); /* * On Unix-like systems Command::status either ends up calling either fork or posix_spawnp diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index f8f00f011..d27b09b98 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -803,8 +803,7 @@ fn digest_reader( Ok(digest.result_str()) } else { // Assume it's SHAKE. result_str() doesn't work with shake (as of 8/30/2016) - let mut bytes = Vec::new(); - bytes.resize((output_bits + 7) / 8, 0); + let mut bytes = vec![0; (output_bits + 7) / 8]; digest.hash_finalize(&mut bytes); Ok(encode(bytes)) } diff --git a/src/uu/sort/src/ext_sort.rs b/src/uu/sort/src/ext_sort.rs index 08de4e33e..183098812 100644 --- a/src/uu/sort/src/ext_sort.rs +++ b/src/uu/sort/src/ext_sort.rs @@ -224,7 +224,7 @@ fn read_write_loop( let mut sender_option = Some(sender); let mut tmp_files = vec![]; loop { - let mut chunk = match receiver.recv() { + let chunk = match receiver.recv() { Ok(it) => it, _ => { return Ok(ReadResult::WroteChunksToFile { tmp_files }); @@ -232,7 +232,7 @@ fn read_write_loop( }; let tmp_file = write::( - &mut chunk, + &chunk, tmp_dir.next_file()?, settings.compress_prog.as_deref(), separator, @@ -262,7 +262,7 @@ fn read_write_loop( /// Write the lines in `chunk` to `file`, separated by `separator`. /// `compress_prog` is used to optionally compress file contents. fn write( - chunk: &mut Chunk, + chunk: &Chunk, file: (File, PathBuf), compress_prog: Option<&str>, separator: u8,