From 00a650bce35b1a98df839e5b6922b07291595d24 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 May 2022 22:30:56 +0100 Subject: [PATCH] shapelib: Rationalise some imports Signed-off-by: Ian Jackson --- src/imports.rs | 4 ++++ src/shapelib-toml.rs | 2 -- src/shapelib.rs | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) 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`, 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), -- 2.30.2