From 8b3c9b744ab41f52f01ee624228e655b981824eb Mon Sep 17 00:00:00 2001 From: rachaelspooky <65132002+rachaelspooky@users.noreply.github.com> Date: Fri, 19 Jul 2024 04:04:42 +0000 Subject: [PATCH] Fix 5 clippy warnings (#32808) Signed-off-by: Rachael Gentry --- components/layout_2020/flexbox/layout.rs | 2 +- components/layout_2020/flow/inline/mod.rs | 5 ++--- components/layout_2020/replaced.rs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs index ccbb52ac868..2520f22f1f9 100644 --- a/components/layout_2020/flexbox/layout.rs +++ b/components/layout_2020/flexbox/layout.rs @@ -1000,7 +1000,7 @@ impl FlexLine<'_> { let max_propagated_baseline = item_propagated_baselines .iter() .copied() - .filter_map(|baseline| baseline) + .flatten() .max() .unwrap_or(Au::zero()); let item_content_cross_start_posititons = self diff --git a/components/layout_2020/flow/inline/mod.rs b/components/layout_2020/flow/inline/mod.rs index 658906dfa48..b5f508e6f29 100644 --- a/components/layout_2020/flow/inline/mod.rs +++ b/components/layout_2020/flow/inline/mod.rs @@ -1360,8 +1360,7 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { block: self .current_line_max_block_size_including_nested_containers() .max(&self.current_line_segment.max_block_size) - .resolve() - .into(), + .resolve(), }; !self.new_potential_line_size_causes_line_break(&potential_line_size) @@ -2054,7 +2053,7 @@ impl IndependentFormattingContext { let (block_sizes, baseline_offset_in_parent) = self.get_block_sizes_and_baseline_offset( inline_formatting_context_state, - size.block.into(), + size.block, baseline_offset, ); inline_formatting_context_state.update_unbreakable_segment_for_new_content( diff --git a/components/layout_2020/replaced.rs b/components/layout_2020/replaced.rs index 0c55f6d9bc1..f7c44046717 100644 --- a/components/layout_2020/replaced.rs +++ b/components/layout_2020/replaced.rs @@ -589,10 +589,10 @@ impl ReplacedContent { let size_from_maybe_clamped = |(clamped_inline, clamped_block): (Option, Option)| { let clamped_inline = clamped_inline - .map(|size| GenericLengthPercentageOrAuto::LengthPercentage(size)) + .map(GenericLengthPercentageOrAuto::LengthPercentage) .unwrap_or(box_size.inline); let clamped_block = clamped_block - .map(|size| GenericLengthPercentageOrAuto::LengthPercentage(size)) + .map(GenericLengthPercentageOrAuto::LengthPercentage) .unwrap_or(box_size.block); LogicalVec2 { inline: clamped_inline,