From cd8fe5097c35819461c44090b6afba0b3fdc613a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 11 May 2022 21:35:19 +0100 Subject: [PATCH] Fix BuiltinLibrary::default_materials_format 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 --- src/shapelib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shapelib.rs b/src/shapelib.rs index f3382a9b..d0bafa48 100644 --- a/src/shapelib.rs +++ b/src/shapelib.rs @@ -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 } } -- 2.30.2