cleanup

diff --git a/rust/pspp/src/spv/read/legacy_xml.rs b/rust/pspp/src/spv/read/legacy_xml.rs
index 4856bd962347cb1072050ecc61ed2f4b81ea800e..bf3d64903d2fec2de7e17eb44c4241a60a4f1213 100644 (file)
--- a/rust/pspp/src/spv/read/legacy_xml.rs
+++ b/rust/pspp/src/spv/read/legacy_xml.rs
@@ -149,23 +149,6 @@ impl Map {
         }
     }
 
-    fn insert_labels(
-        &mut self,
-        data: &[Datum<String>],
-        label_series: &Series,
-        format: crate::format::Format,
-    ) {
-        for (value, label) in data.iter().zip(label_series.values.iter()) {
-            if let Some(Some(number)) = value.as_number() {
-                let dest = match label {
-                    Datum::Number(_) => label.display(format).with_stretch().to_string(),
-                    Datum::String(s) => s.clone(),
-                };
-                self.0.insert(OrderedFloat(number), Datum::String(dest));
-            }
-        }
-    }
-
     fn from_vmes(value_map: &[ValueMapEntry]) -> Self {
         let mut map = Map::new();
         for vme in value_map {
@@ -906,13 +889,18 @@ impl Variable for SourceVariable {
             Map::from_string_format(string_format).apply(&mut data);
         };
         if let Some(label_series) = label_series {
-            let mut map = Map::new();
-            map.insert_labels(
-                &data,
-                label_series,
-                self.format.as_ref().map_or(F8_0, |f| f.decode()),
-            );
-            map.apply(&mut data);
+            let format = self.format.as_ref().map_or(F8_0, |f| f.decode());
+            data = label_series
+                .values
+                .iter()
+                .map(|label| {
+                    if label.is_number() {
+                        Datum::String(label.display(format).with_stretch().to_string())
+                    } else {
+                        label.clone()
+                    }
+                })
+                .collect();
         }
         series.insert(
             &self.id,