From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 14 May 2022 21:30:56 +0000 (+0100)
Subject: shapelib: Rationalise some imports
X-Git-Tag: otter-1.1.0~163
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=00a650bce35b1a98df839e5b6922b07291595d24;p=otter.git

shapelib: Rationalise some imports

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

diff --git a/src/imports.rs b/src/imports.rs
index a05046cb..94c2864b 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -156,6 +156,10 @@ pub type IOI = IOccultIlk;
 // pcrender.rs
 pub use PriOccultedGeneral as PriOG;
 
+// shapelib.rs
+pub use shapelib::LibraryLoadError as LLE;
+pub use shapelib::LibraryLoadMFIncompat as LLMI;
+
 // updates.rs
 pub use OpOutcomeThunkGeneric as OOTG;
 pub type PUE = PreparedUpdateEntry;
diff --git a/src/shapelib-toml.rs b/src/shapelib-toml.rs
index bd5e71be..9d8f1197 100644
--- a/src/shapelib-toml.rs
+++ b/src/shapelib-toml.rs
@@ -6,8 +6,6 @@ use crate::prelude::*;
 
 use shapelib::OutlineDefnEnum;
 
-#[doc(hidden)] pub type LLE = shapelib::LibraryLoadError;
-
 // At the implementation level, each loaded item contains an
 // `Arc<GroupDetails>`, which is simply stored directly.  The
 // `GroupDefn` is processed.
diff --git a/src/shapelib.rs b/src/shapelib.rs
index 988fd604..4a979345 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -156,8 +156,6 @@ pub enum LibraryLoadMFIncompat {
   #[error("orig_size no longer supported")] OrigSizeForbidden,
   #[error("specified both size and numeric scale")] ContradictoryScale,
 }
-pub use LibraryLoadMFIncompat as LLMI;
-
 #[derive(Error,Copy,Clone,Debug,Eq,PartialEq)]
 pub enum SubstErrorKind {
   #[error("missing or unrecognised token {0}")] MissingToken (&'static str),