shapelib: Put *EnquiryData in the prelude

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 9b354037510b8c52ffe023e0020b291c310b298f..0aa83bd48ddafc78a391e9bd77522ec3b594dbd3 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -362,7 +362,7 @@ fn execute_and_respond<R,W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
               .map(|ll| ll.iter())
               .flatten()
               .map(|l| l.enquiry())
-              .collect::<Vec<shapelib::LibraryEnquiryData>>()
+              .collect::<Vec<LibraryEnquiryData>>()
           )
         )?;
       MR::Libraries(libs)
@@ -375,7 +375,7 @@ fn execute_and_respond<R,W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
           cs,&ag,&gref, &[TP::UploadBundles],
           &mut |ig, _| {
             let regs = ig.all_shapelibs();
-            let mut results: Vec<shapelib::ItemEnquiryData> = default();
+            let mut results: Vec<ItemEnquiryData> = default();
             let libss = if let Some(lib) = &lib {
               vec![regs.lib_name_lookup(lib)?]
             } else {

diff --git a/src/commands.rs b/src/commands.rs
index 38d5a17e25111113b4961415543bf16d917af014..c00f870dcd9cf8e02141a0324cd776af5ee82448 100644 (file)
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -94,8 +94,8 @@ pub enum MgmtResponse {
   AlterGame { error: Option<MgmtError>, responses: Vec<MgmtGameResponse> },
   AccountsList(Vec<Arc<AccountName>>),
   GamesList(Vec<Arc<InstanceName>>),
-  Libraries(Vec<shapelib::LibraryEnquiryData>),
-  LibraryItems(Vec<shapelib::ItemEnquiryData>),
+  Libraries(Vec<LibraryEnquiryData>),
+  LibraryItems(Vec<ItemEnquiryData>),
   Bundles { bundles: MgmtBundleList },
 }
 

diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs
index be4547f90a3f3077f8359d62b30e62c53ac0ce0a..cd20b9ddc2b5f83794f7f70b9eb680de4f143a47 100644 (file)
--- a/src/mgmtchannel.rs
+++ b/src/mgmtchannel.rs
@@ -213,7 +213,7 @@ impl MgmtChannelForGame {
 
   #[throws(AE)]
   pub fn list_items(&mut self, lib: Option<String>, pat: String)
-                -> Vec<shapelib::ItemEnquiryData> {
+                -> Vec<ItemEnquiryData> {
     // xxx allow globbing of library names
     let cmd = MgmtCommand::LibraryListByGlob {
       game: self.game.clone(),

diff --git a/src/prelude.rs b/src/prelude.rs
index bffec21d3acc893e184997ba678ad58601d20fad..6b2371a6146351b24b92d2c3b54a4ded94d3ec69 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -152,7 +152,9 @@ pub use crate::pcrender::*;
 pub use crate::pieces::*;
 pub use crate::progress::{self, ProgressInfo, OriginatorExt as _};
 pub use crate::shapelib;
-pub use crate::shapelib::{CircleShape, RectShape, LibraryLoadError};
+pub use crate::shapelib::{CircleShape, RectShape};
+pub use crate::shapelib::{ItemEnquiryData, LibraryEnquiryData};
+pub use crate::shapelib::{LibraryLoadError};
 pub use crate::slotmap_slot_idx::*;
 pub use crate::spec::*;
 pub use crate::spec::piece_specs::{FaceColourSpecs, SimpleCommon};