shapelib: Plumb mformat through to OutlineDefn via GroupData

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 835f7f315560bc532307dd3b14d740b99081c192..6ee0e488adc8b643f4b046da21814c5fafa5ff56 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -26,6 +26,7 @@ pub struct Registry {
 pub struct GroupData {
   groupname: String,
   d: GroupDetails,
+  #[allow(dead_code)] /*TODO*/ mformat: materials_format::Version,
 }
 
 #[typetag::deserialize(tag="outline")]
@@ -777,7 +778,6 @@ pub fn load_catalogue(libname: &str, src: &mut dyn LibrarySource)
       materials_format::Version::try_from_integer(v)?
     },
   };
-  let _: materials_format::Version = mformat;
 
   let mut l = Catalogue {
     bundle: src.bundle(),
@@ -799,7 +799,7 @@ pub fn load_catalogue(libname: &str, src: &mut dyn LibrarySource)
     };
     let group = Arc::new(GroupData {
       groupname: groupname.clone(),
-      d,
+      d, mformat,
     });
     group.d.outline.check(&group)?;
     if [