From: Ben Pfaff Date: Sun, 6 Apr 2025 19:14:12 +0000 (-0700) Subject: more unused fields X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aff65cf26b5aba22bfdb3570867291d6ea90ca22;p=pspp more unused fields --- diff --git a/rust/pspp/src/output/pivot/mod.rs b/rust/pspp/src/output/pivot/mod.rs index ed18ff5081..6cdb9d7b7e 100644 --- a/rust/pspp/src/output/pivot/mod.rs +++ b/rust/pspp/src/output/pivot/mod.rs @@ -72,7 +72,6 @@ use color::{palette::css::TRANSPARENT, AlphaColor, Rgba8, Srgb}; use encoding_rs::UTF_8; use enum_iterator::Sequence; use enum_map::{enum_map, Enum, EnumMap}; -use itertools::Itertools; use look_xml::TableProperties; use quick_xml::{de::from_str, DeError}; use serde::{de::Visitor, Deserialize}; @@ -409,7 +408,7 @@ impl DimensionBuilder { self.hide_all_labels = true; self } - fn build(mut self, top_index: usize, label_position: LabelPosition) -> Dimension { + fn build(mut self, label_position: LabelPosition) -> Dimension { let mut leaves = Vec::with_capacity(self.len); self.root.assign_label_depth(label_position, true); let root = self.root.build(label_position, None, &mut leaves); @@ -511,8 +510,7 @@ impl GroupBuilder { children: self .children .into_iter() - .enumerate() - .map(|(group_index, c)| c.build(label_position, weak.clone(), group_index, leaves)) + .map(|c| c.build(label_position, weak.clone(), leaves)) .collect(), show_label: { // By default, nested group labels are shown, but not dimension root labels. @@ -546,7 +544,6 @@ impl CategoryBuilder { self, label_position: LabelPosition, parent: Weak, - group_index: usize, leaves: &mut Vec>, ) -> Category { match self { @@ -659,14 +656,14 @@ impl PivotTableBuilder { let mut axes = EnumMap::from_fn(|_axis| Axis { dimensions: Vec::with_capacity(self.dimensions.len()), }); - for (top_index, d) in self.dimensions.into_iter().enumerate() { + for d in self.dimensions { let axis = d.axis; let label_position = if axis == Axis3::Y && table.corner_text.is_none() { self.look.row_label_position } else { LabelPosition::Nested }; - let d = d.build(top_index, label_position); + let d = d.build(label_position); axes[axis].dimensions.push(dimensions.len()); dimensions.push(d); }