From c90ec3c4da3c9b06febde6cae446daa3c8dc677b Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Sun, 6 Apr 2025 15:22:10 -0300 Subject: [PATCH] listen to clippy --- crates/typst-layout/src/grid/lines.rs | 1 + crates/typst-layout/src/grid/repeated.rs | 19 ++++++++----------- crates/typst-layout/src/grid/rowspans.rs | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/crates/typst-layout/src/grid/lines.rs b/crates/typst-layout/src/grid/lines.rs index f0da6fb97..2eb8072ee 100644 --- a/crates/typst-layout/src/grid/lines.rs +++ b/crates/typst-layout/src/grid/lines.rs @@ -391,6 +391,7 @@ pub fn vline_stroke_at_row( /// /// This function assumes columns are sorted by increasing `x`, and rows are /// sorted by increasing `y`. +#[allow(clippy::too_many_arguments)] pub fn hline_stroke_at_column( grid: &CellGrid, rows: &[RowPiece], diff --git a/crates/typst-layout/src/grid/repeated.rs b/crates/typst-layout/src/grid/repeated.rs index 33534e0f2..98eb7f77f 100644 --- a/crates/typst-layout/src/grid/repeated.rs +++ b/crates/typst-layout/src/grid/repeated.rs @@ -1,5 +1,3 @@ -use std::ops::Deref; - use typst_library::diag::SourceResult; use typst_library::engine::Engine; use typst_library::layout::grid::resolve::{Footer, Header, Repeatable}; @@ -220,14 +218,14 @@ impl<'a> GridLayouter<'a> { HeadersToLayout::RepeatingAndPending => self.simulate_header_height( self.repeating_headers .iter() - .map(Deref::deref) - .chain(self.pending_headers.into_iter().map(Repeatable::unwrap)), + .copied() + .chain(self.pending_headers.iter().map(Repeatable::unwrap)), &self.regions, engine, disambiguator, )?, HeadersToLayout::NewHeaders { headers, .. } => self.simulate_header_height( - headers.into_iter().map(Repeatable::unwrap), + headers.iter().map(Repeatable::unwrap), &self.regions, engine, disambiguator, @@ -260,9 +258,8 @@ impl<'a> GridLayouter<'a> { // when beginning a new region. self.simulate_header_height( self.repeating_headers - .iter() - .map(|h| *h) - .chain(self.pending_headers.into_iter().chain(headers).map(Repeatable::unwrap)), + .iter().copied() + .chain(self.pending_headers.iter().chain(headers).map(Repeatable::unwrap)), &self.regions, engine, disambiguator, @@ -297,7 +294,7 @@ impl<'a> GridLayouter<'a> { // new region to make sure row code is aware that all of those // headers should stay together! self.unbreakable_rows_left += - total_header_row_count(headers.into_iter().map(Repeatable::unwrap)); + total_header_row_count(headers.iter().map(Repeatable::unwrap)); } // Need to relayout ALL headers if we skip a region, not only the @@ -306,10 +303,10 @@ impl<'a> GridLayouter<'a> { // footers. if matches!(headers, HeadersToLayout::RepeatingAndPending) || skipped_region { let repeating_header_rows = - total_header_row_count(self.repeating_headers.iter().map(Deref::deref)); + total_header_row_count(self.repeating_headers.iter().copied()); let pending_header_rows = total_header_row_count( - self.pending_headers.into_iter().map(Repeatable::unwrap), + self.pending_headers.iter().map(Repeatable::unwrap), ); self.unbreakable_rows_left += repeating_header_rows + pending_header_rows; diff --git a/crates/typst-layout/src/grid/rowspans.rs b/crates/typst-layout/src/grid/rowspans.rs index 42cb77962..497490e7d 100644 --- a/crates/typst-layout/src/grid/rowspans.rs +++ b/crates/typst-layout/src/grid/rowspans.rs @@ -1176,10 +1176,10 @@ impl<'a> RowspanSimulator<'a> { { // Only repeating headers have survived after the first region // break. - let repeating_headers = layouter.repeating_headers.iter().map(|h| *h).chain( + let repeating_headers = layouter.repeating_headers.iter().copied().chain( layouter .pending_headers - .into_iter() + .iter() .filter_map(Repeatable::as_repeated), );