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 a05046cbb969f81930e4133d05df09212eeee7cf..94c2864bbf3df03c12e8b980f11707d94263f5c6 100644 (file)
--- 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 bd5e71be5135ca189ec817ac2b49778b7dbcc34b..9d8f119745b8f4053cde97115af2a33335af99dc 100644 (file)
--- 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 988fd604442f51d57272a86cd8422b7a1134da6f..4a979345a73777e8d5f3441926cdb97e3dfe386c 100644 (file)
--- 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),