From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 May 2022 20:44:42 +0000 (+0100)
Subject: mformat 2: Insist that builtin libraries have an explicit version
X-Git-Tag: otter-1.1.0~232
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=40fad80c55b64924803fd8ed5c87e93fb2b9f19a;p=otter.git

mformat 2: Insist that builtin libraries have an explicit version

We don't want to be setting the bad example of a missing `format`, and
of course we don't want to be using format=1 either.

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 83d39f92..d853b3b2 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -910,7 +910,7 @@ impl LibrarySource for BuiltinLibrary<'_> {
 
   #[throws(materials_format::VersionError)]
   fn default_materials_format(&self) -> materials_format::Version {
-    1.try_into().unwrap() // TODO
+    throw!(MFVE::Other("builtin libraries must have explicit version now!"));
   }
 }