From: Ben Pfaff Date: Tue, 4 Nov 2025 20:57:01 +0000 (-0800) Subject: work X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c75ddf755591ccca48f1963d3911f402662c94f8;p=pspp work --- diff --git a/rust/pspp/src/output/pivot.rs b/rust/pspp/src/output/pivot.rs index e0f5277d04..197835b05d 100644 --- a/rust/pspp/src/output/pivot.rs +++ b/rust/pspp/src/output/pivot.rs @@ -74,7 +74,7 @@ use tlo::parse_tlo; use crate::{ calendar::date_time_to_pspp, - data::{ByteString, Datum, EncodedString, RawString}, + data::{ByteString, Datum, EncodedString}, format::{ DATETIME40_0, Decimal, F8_2, F40, F40_2, F40_3, Format, PCT40_1, Settings as FormatSettings, Type, UncheckedFormat, diff --git a/rust/pspp/src/output/spv/legacy_xml.rs b/rust/pspp/src/output/spv/legacy_xml.rs index 5042e47b87..fd91c341e4 100644 --- a/rust/pspp/src/output/spv/legacy_xml.rs +++ b/rust/pspp/src/output/spv/legacy_xml.rs @@ -1007,7 +1007,7 @@ struct Format { impl Format { fn decode(&self) -> crate::format::Format { - if let Some(base_format) = self.base_format { + if self.base_format.is_some() { SignificantDateTimeFormat::from(self).decode() } else { SignificantNumberFormat::from(self).decode() @@ -2077,7 +2077,7 @@ struct MajorTicks { #[serde(rename = "@stagger")] stagger: Option, - gridline: Gridline, + gridline: Option, } #[derive(Deserialize, Debug)] @@ -2110,7 +2110,7 @@ impl Label { fn text(&self) -> &[Text] { match &self.child { LabelChild::Text(texts) => texts.as_slice(), - LabelChild::DescriptionGroup(description_group) => &[], + LabelChild::DescriptionGroup(_) => &[], } }