From b24283b9932ddccea8bbc95ad9d6561c3dfe0453 Mon Sep 17 00:00:00 2001 From: Reese Williams Date: Sun, 7 Jan 2024 23:07:37 +0000 Subject: [PATCH] clippy --- librubyfmt/src/format.rs | 4 ++-- librubyfmt/src/ripper_tree_types.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/librubyfmt/src/format.rs b/librubyfmt/src/format.rs index 2380a76e..b2b31aad 100644 --- a/librubyfmt/src/format.rs +++ b/librubyfmt/src/format.rs @@ -3417,13 +3417,13 @@ fn format_aryptn(ps: &mut dyn ConcreteParserState, aryptn: Aryptn) { Box::new(|ps| { let mut vals = Vec::new(); if let Some(pre_star_list) = maybe_pre_star_list { - vals.append(&mut pre_star_list.clone()); + vals.append(&mut (pre_star_list.clone())); } if let Some(star) = maybe_star { vals.push(pattern_splat_as_expr(star)); } if let Some(post_star_list) = maybe_post_star_list { - vals.append(&mut post_star_list.clone()); + vals.append(&mut (post_star_list.clone())); } format_list_like_thing_items(ps, vals, None, false); }), diff --git a/librubyfmt/src/ripper_tree_types.rs b/librubyfmt/src/ripper_tree_types.rs index cf735298..057645d6 100644 --- a/librubyfmt/src/ripper_tree_types.rs +++ b/librubyfmt/src/ripper_tree_types.rs @@ -269,8 +269,7 @@ impl Expression { } Expression::Aryptn(Aryptn(_, _, exprs, star, ..)) => exprs .as_ref() - .map(|exprs| exprs.first().map(|expr| expr.start_line()).flatten()) - .flatten() + .and_then(|exprs| exprs.first().and_then(|expr| expr.start_line())) .or_else(|| { Some( star.as_ref()