From d5c07741e19edc7715bb7e1c7e6098a21cda31e3 Mon Sep 17 00:00:00 2001 From: Joining7943 <111500881+Joining7943@users.noreply.github.com> Date: Sun, 2 Apr 2023 16:55:57 +0200 Subject: [PATCH] tail: Fix clippy warnings --- src/uu/tail/src/chunks.rs | 5 +---- src/uu/tail/src/error.rs | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/uu/tail/src/chunks.rs b/src/uu/tail/src/chunks.rs index 584d163bb12..9617c18c8a2 100644 --- a/src/uu/tail/src/chunks.rs +++ b/src/uu/tail/src/chunks.rs @@ -726,10 +726,7 @@ mod tests { let result = chunk.fill(&mut cursor); assert!(result.is_ok()); let option = result.unwrap(); - return match option { - Some(size) => size, - None => 0, - }; + option.unwrap_or(0) } fn fill_lines_chunk_buffer(buffer: &mut LinesChunkBuffer, data: &str) -> u64 { diff --git a/src/uu/tail/src/error.rs b/src/uu/tail/src/error.rs index 3a2b90027ea..55a0db42c80 100644 --- a/src/uu/tail/src/error.rs +++ b/src/uu/tail/src/error.rs @@ -318,7 +318,7 @@ mod tests { use std::io::{Read, Write}; use tempfile::NamedTempFile; - fn run_and_assert(mut file: File, mut handler: IOErrorHandler, expected: String) { + fn run_and_assert(mut file: File, mut handler: IOErrorHandler, expected: &str) { let mut buffer = String::new(); if let Err(error) = file.read_to_string(&mut buffer) { match handler.handle(IoContextError::new(error, IoErrorContext::Stat)) { @@ -356,7 +356,7 @@ mod tests { path.display() ); - run_and_assert(file, handler, expected); + run_and_assert(file, handler, &expected); // setup let handler = IOErrorHandler::with_printer( @@ -378,7 +378,7 @@ mod tests { path.display() ); - run_and_assert(file, handler, expected); + run_and_assert(file, handler, &expected); } #[test]