From 41e2197188ab2679513fbc17816ed68ce786197d Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Sun, 30 Jan 2022 15:24:29 +0100 Subject: [PATCH] squash some repeated match blocks --- src/uu/cut/src/cut.rs | 7 ++++--- src/uu/dd/src/parseargs.rs | 9 +-------- src/uu/du/src/du.rs | 8 ++++---- src/uu/expr/src/syntax_tree.rs | 14 ++------------ src/uu/expr/src/tokens.rs | 20 ++++---------------- src/uu/ln/src/ln.rs | 10 +++++----- src/uu/ls/src/ls.rs | 6 ++---- src/uu/test/src/test.rs | 3 +-- src/uu/wc/src/wc.rs | 7 +------ src/uucore/src/lib/lib.rs | 3 +-- src/uucore/src/lib/parser/parse_size.rs | 3 +-- 11 files changed, 26 insertions(+), 64 deletions(-) diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index 1c9470370..fc8494965 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -372,9 +372,10 @@ fn cut_files(mut filenames: Vec, mode: &Mode) -> UResult<()> { .map_err_context(|| filename.maybe_quote().to_string()) .and_then(|file| { match &mode { - Mode::Bytes(ref ranges, ref opts) => cut_bytes(file, ranges, opts), - Mode::Characters(ref ranges, ref opts) => cut_bytes(file, ranges, opts), - Mode::Fields(ref ranges, ref opts) => cut_fields(file, ranges, opts), + Mode::Bytes(ranges, opts) | Mode::Characters(ranges, opts) => { + cut_bytes(file, ranges, opts) + } + Mode::Fields(ranges, opts) => cut_fields(file, ranges, opts), } })); } diff --git a/src/uu/dd/src/parseargs.rs b/src/uu/dd/src/parseargs.rs index d85a7fcc7..492ab70cb 100644 --- a/src/uu/dd/src/parseargs.rs +++ b/src/uu/dd/src/parseargs.rs @@ -487,14 +487,7 @@ pub fn parse_conv_flag_input(matches: &Matches) -> Result { - if case.is_some() { - return Err(ParseError::MultipleUCaseLCase); - } else { - case = Some(flag); - } - } - ConvFlag::LCase => { + ConvFlag::UCase | ConvFlag::LCase => { if case.is_some() { return Err(ParseError::MultipleUCaseLCase); } else { diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 16e1d166f..7629aba69 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -444,10 +444,10 @@ impl Error for DuError {} impl UError for DuError { fn code(&self) -> i32 { match self { - Self::InvalidMaxDepthArg(_) => 1, - Self::SummarizeDepthConflict(_) => 1, - Self::InvalidTimeStyleArg(_) => 1, - Self::InvalidTimeArg(_) => 1, + Self::InvalidMaxDepthArg(_) + | Self::SummarizeDepthConflict(_) + | Self::InvalidTimeStyleArg(_) + | Self::InvalidTimeArg(_) => 1, } } } diff --git a/src/uu/expr/src/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs index 8894f87fb..c11689a07 100644 --- a/src/uu/expr/src/syntax_tree.rs +++ b/src/uu/expr/src/syntax_tree.rs @@ -302,12 +302,7 @@ fn push_token_to_either_stack( } } - Token::PrefixOp { .. } => { - op_stack.push((token_idx, token.clone())); - Ok(()) - } - - Token::ParOpen => { + Token::PrefixOp { .. } | Token::ParOpen => { op_stack.push((token_idx, token.clone())); Ok(()) } @@ -352,12 +347,7 @@ fn push_op_to_stack( { loop { match op_stack.last() { - None => { - op_stack.push((token_idx, token.clone())); - return Ok(()); - } - - Some(&(_, Token::ParOpen)) => { + None | Some(&(_, Token::ParOpen)) => { op_stack.push((token_idx, token.clone())); return Ok(()); } diff --git a/src/uu/expr/src/tokens.rs b/src/uu/expr/src/tokens.rs index 27912d006..247046941 100644 --- a/src/uu/expr/src/tokens.rs +++ b/src/uu/expr/src/tokens.rs @@ -82,25 +82,17 @@ pub fn strings_to_tokens(strings: &[String]) -> Result, Stri ":" => Token::new_infix_op(s, true, 6), - "*" => Token::new_infix_op(s, true, 5), - "/" => Token::new_infix_op(s, true, 5), - "%" => Token::new_infix_op(s, true, 5), + "*" | "/" | "%" => Token::new_infix_op(s, true, 5), - "+" => Token::new_infix_op(s, true, 4), - "-" => Token::new_infix_op(s, true, 4), + "+" | "-" => Token::new_infix_op(s, true, 4), - "=" => Token::new_infix_op(s, true, 3), - "!=" => Token::new_infix_op(s, true, 3), - "<" => Token::new_infix_op(s, true, 3), - ">" => Token::new_infix_op(s, true, 3), - "<=" => Token::new_infix_op(s, true, 3), - ">=" => Token::new_infix_op(s, true, 3), + "=" | "!=" | "<" | ">" | "<=" | ">=" => Token::new_infix_op(s, true, 3), "&" => Token::new_infix_op(s, true, 2), "|" => Token::new_infix_op(s, true, 1), - "match" => Token::PrefixOp { + "match" | "index" => Token::PrefixOp { arity: 2, value: s.clone(), }, @@ -108,10 +100,6 @@ pub fn strings_to_tokens(strings: &[String]) -> Result, Stri arity: 3, value: s.clone(), }, - "index" => Token::PrefixOp { - arity: 2, - value: s.clone(), - }, "length" => Token::PrefixOp { arity: 1, value: s.clone(), diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index ff9a34d43..40648ab44 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -81,11 +81,11 @@ impl Error for LnError {} impl UError for LnError { fn code(&self) -> i32 { match self { - Self::TargetIsDirectory(_) => 1, - Self::SomeLinksFailed => 1, - Self::FailedToLink(_) => 1, - Self::MissingDestination(_) => 1, - Self::ExtraOperand(_) => 1, + Self::TargetIsDirectory(_) + | Self::SomeLinksFailed + | Self::FailedToLink(_) + | Self::MissingDestination(_) + | Self::ExtraOperand(_) => 1, } } } diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index ed858e62a..7fdec53f0 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -150,8 +150,7 @@ impl UError for LsError { fn code(&self) -> i32 { match self { LsError::InvalidLineWidth(_) => 2, - LsError::IOError(_) => 1, - LsError::IOErrorContext(_, _) => 1, + LsError::IOError(_) | LsError::IOErrorContext(_, _) => 1, } } } @@ -1845,8 +1844,7 @@ fn get_block_size(md: &Metadata, config: &Config) -> u64 { // hard-coded for now - enabling setting this remains a TODO let ls_block_size = 1024; match config.size_format { - SizeFormat::Binary => md.blocks() * 512, - SizeFormat::Decimal => md.blocks() * 512, + SizeFormat::Binary | SizeFormat::Decimal => md.blocks() * 512, SizeFormat::Bytes => md.blocks() * 512 / ls_block_size, } } diff --git a/src/uu/test/src/test.rs b/src/uu/test/src/test.rs index e5f8a93d6..1a3f4139e 100644 --- a/src/uu/test/src/test.rs +++ b/src/uu/test/src/test.rs @@ -211,14 +211,13 @@ fn eval(stack: &mut Vec) -> Result { }) } Some(Symbol::Literal(s)) => Ok(!s.is_empty()), - Some(Symbol::None) => Ok(false), + Some(Symbol::None) | None => Ok(false), Some(Symbol::BoolOp(op)) => { let b = eval(stack)?; let a = eval(stack)?; Ok(if op == "-a" { a && b } else { a || b }) } - None => Ok(false), _ => Err("expected value".to_string()), } } diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index 6a96d425b..59aea1542 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -253,12 +253,7 @@ fn word_count_from_reader( } if settings.show_max_line_length { match ch { - '\n' => { - total.max_line_length = max(current_len, total.max_line_length); - current_len = 0; - } - // '\x0c' = '\f' - '\r' | '\x0c' => { + '\n' | '\r' | '\x0c' => { total.max_line_length = max(current_len, total.max_line_length); current_len = 0; } diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs index 4c9d6c21d..ae7788e05 100644 --- a/src/uucore/src/lib/lib.rs +++ b/src/uucore/src/lib/lib.rs @@ -151,8 +151,7 @@ pub enum ConversionResult { impl ConversionResult { pub fn accept_any(self) -> Vec { match self { - Self::Complete(result) => result, - Self::Lossy(result) => result, + Self::Complete(result) | Self::Lossy(result) => result, } } diff --git a/src/uucore/src/lib/parser/parse_size.rs b/src/uucore/src/lib/parser/parse_size.rs index 797daebbb..35a03ea32 100644 --- a/src/uucore/src/lib/parser/parse_size.rs +++ b/src/uucore/src/lib/parser/parse_size.rs @@ -102,8 +102,7 @@ impl Error for ParseSizeError { impl fmt::Display for ParseSizeError { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { let s = match self { - ParseSizeError::ParseFailure(s) => s, - ParseSizeError::SizeTooBig(s) => s, + ParseSizeError::ParseFailure(s) | ParseSizeError::SizeTooBig(s) => s, }; write!(f, "{}", s) }