chiark / gitweb /
Fix BuiltinLibrary::default_materials_format
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 11 May 2022 20:35:19 +0000 (21:35 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 11 May 2022 22:16:43 +0000 (23:16 +0100)
This needs to be 1, for now, since all our libraries are still in
format 1.

This was wrong since it was introduced in
  materials format: Plumb through to load_catalogue
but hasn't mattered because nothing in the shapelib code actually
looks at the format yet.

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

index f3382a9bcb1921919b4a22819ce868a0011992cb..d0bafa4828620d9a51a5ab349452b091260b2f7f 100644 (file)
@@ -816,8 +816,7 @@ impl LibrarySource for BuiltinLibrary<'_> {
 
   #[throws(materials_format::VersionError)]
   fn default_materials_format(&self) -> materials_format::Version {
-    materials_format::Version::CURRENT
-    //throw!(MFVE::Other("builtin libraries must have explicit version now!"));
+    1.try_into().unwrap() // TODO
   }
 }