crate structure: Rename "imports" to "crates"

This will let us use "imports" for what is now "prelude-part".

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

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index ca3337ff68c94d86c95a42f7284b89af783462d2..ead6ff0de28d80943ee27cdae0de4b63dee13000 100644 (file)
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -10,14 +10,14 @@
 
 // ==================== namespace preparation ====================
 
-pub mod imports {
+pub mod crates {
   pub use otter;
-  pub use otter::imports::*;
+  pub use otter::crates::*;
 
   pub use humantime;
 }
 
-pub use imports::*;
+pub use crates::*;
 pub use otter::prelude::*;
 
 pub use std::cell::{RefCell, RefMut};
@@ -32,7 +32,7 @@ pub type MgmtChannel = ClientMgmtChannel;
 pub type JsV = serde_json::Value;
 pub type MC = MgmtCommand;
 
-// -------------------- private imports ----------
+// -------------------- private crates ----------
 
 use otter::config::DAEMON_STARTUP_REPORT;
 
@@ -344,7 +344,7 @@ impl<T,E> Result<T,E> {
 // -------------------- cleanup_notify (signaling) --------------------
 
 pub mod cleanup_notify {
-  use super::imports::*;
+  use super::crates::*;
   use super::AE;
   pub use super::Void; // TODO remove the need for this
 

diff --git a/base/imports.rs b/base/crates.rs
similarity index 100%
rename from base/imports.rs
rename to base/crates.rs

diff --git a/base/lib.rs b/base/lib.rs
index be02056aba5696c6b20ffe6d5e1dc2419f3f89fd..5d1ebcd4db60b3bd2aca2731c554949356e817e8 100644 (file)
--- a/base/lib.rs
+++ b/base/lib.rs
@@ -11,7 +11,7 @@
 #![allow(clippy::redundant_closure_call)]
 #![allow(clippy::writeln_empty_string)]
 
-pub mod imports;
+pub mod crates;
 pub mod prelude;
 
 #[path="prelude-part.rs"]

diff --git a/base/prelude.rs b/base/prelude.rs
index 01726c19e237a1f5c73e7b96cf9a8577cb14c245..b27ff729d8c860691af0c19eae6e67cf836d6a93 100644 (file)
--- a/base/prelude.rs
+++ b/base/prelude.rs
@@ -2,5 +2,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub use crate::imports::*;
+pub use crate::crates::*;
 pub use crate::prelude_part::*;

diff --git a/cli/otter.rs b/cli/otter.rs
index 89657b9aa4d675bff120121bd17c108711128cbe..c8dae276aca9dfa1d0dde721c22be6c09a15daf3 100644 (file)
--- a/cli/otter.rs
+++ b/cli/otter.rs
@@ -14,7 +14,7 @@
 
 pub type MgmtChannel = ClientMgmtChannel;
 
-pub use otter::imports::*;
+pub use otter::crates::*;
 
 pub use std::cell::Cell;
 pub use std::cell::RefCell;

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index eed935fb8e61903023e5d5e6577a3ee1bea3fa64..ba97590696a089b8ab039fa539110155928540e3 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -4,7 +4,7 @@
 
 // management API implementation
 
-use otter::imports::*;
+use otter::crates::*;
 
 use super::*;
 use otter::commands::*;

diff --git a/daemon/imports.rs b/daemon/crates.rs
similarity index 83%
rename from daemon/imports.rs
rename to daemon/crates.rs
index 35e5c4f147c096b6c16b2fa99369d8a2bc62d081..0cdd2a44dc1523b81502c700919a1c61c19bd7da 100644 (file)
--- a/daemon/imports.rs
+++ b/daemon/crates.rs
@@ -2,4 +2,4 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub use otter::imports::*;
+pub use otter::crates::*;

diff --git a/daemon/main.rs b/daemon/main.rs
index f7ba4aafb360ed15883023e13dca86fcbc5ff32f..21ca40d8e1a16ccd6d4d171ee30c991d6ed274d0 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -9,9 +9,9 @@
 //! This program requires many additional runtime resources, which you are
 //! expected to build, along with the daemon, using the Otter `Makefile`.
 
-use otter::imports::*;
+use otter::crates::*;
 
-pub mod imports;
+pub mod crates;
 
 pub mod api;
 pub mod cmdlistener;

diff --git a/jstest/jstest.rs b/jstest/jstest.rs
index a1d05335568f12ea6d540844ca22343bb44b2753..83bf331531471b4d96ed048d07e2b229acbd207a 100644 (file)
--- a/jstest/jstest.rs
+++ b/jstest/jstest.rs
@@ -11,7 +11,7 @@
 #![allow(clippy::or_fun_call)]
 #![allow(clippy::unnecessary_operation)] // trips on #[throws(Explode)]
 
-pub use otter::imports::*;
+pub use otter::crates::*;
 pub use otter::prelude::*;
 
 pub use otter_api_tests::Explode;

diff --git a/src/imports.rs b/src/crates.rs
similarity index 100%
rename from src/imports.rs
rename to src/crates.rs

diff --git a/src/digestrw.rs b/src/digestrw.rs
index eb8a14a4abacbacc05630e9cfe1fc700ac9752ba..08037393a458f7ef30e3b577bcbc5f7de0a4c88a 100644 (file)
--- a/src/digestrw.rs
+++ b/src/digestrw.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-use crate::imports::*;
+use crate::crates::*;
 use crate::prelude::*;
 
 #[derive(Debug,Copy,Clone)]

diff --git a/src/hidden.rs b/src/hidden.rs
index 3509975d262f57ff7ad24f0d641d69fd981f7c01..15853ec8cf4072224705ed639269d1cc905edc87 100644 (file)
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-use crate::imports::*;
+use crate::crates::*;
 use crate::prelude::*;
 
 #[path="vpid.rs"] mod vpid;

diff --git a/src/lib.rs b/src/lib.rs
index 76f80d0215e1c680e6c13e070e5b33a9b9ee3d4c..c61b076dd05d33274c4ec756c5d9135c4952e8f8 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,7 @@
 //! To run an Otter server, you will need to read the
 //! [build instructions](https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/build.html).
 
-pub mod imports;
+pub mod crates;
 pub mod prelude;
 
 #[path="prelude-part.rs"]

diff --git a/src/prelude-part.rs b/src/prelude-part.rs
index 1e583f4c50fd70bc055825af380fa9777b413035..45b4f0a2340a78a3f81110b0c4b76a760bdca8c1 100644 (file)
--- a/src/prelude-part.rs
+++ b/src/prelude-part.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-use crate::imports::*;
-use otter_support::imports::*;
-use otter_base::imports::*;
+use crate::crates::*;
+use otter_support::crates::*;
+use otter_base::crates::*;
 
 use otter_base::prelude_part::*;
 
@@ -98,7 +98,7 @@ pub use url::Url;
 pub use vecdeque_stableix::Deque as StableIndexVecDeque;
 pub use vecdeque_stableix::Offset as StableIndexOffset;
 pub use void::{unreachable, Void, ResultVoidExt, ResultVoidErrExt};
-pub use crate::imports::zipfile::{self, read::ZipFile, result::ZipError};
+pub use crate::crates::zipfile::{self, read::ZipFile, result::ZipError};
 
 use nix::time::ClockId;
 pub const CLOCK_REALTIME : ClockId = ClockId::CLOCK_REALTIME ;

diff --git a/src/prelude.rs b/src/prelude.rs
index 74d83ff7c1c196554c66191ab6cbe88c09a309ef..d30fa1809d956d1ed7f391f337309be7e1e9bc24 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub use crate::imports::*;
+pub use crate::crates::*;
 pub use crate::prelude_part::*;
 
-pub use otter_base::imports::*;
+pub use otter_base::crates::*;
 pub use otter_base::prelude_part::*;
 
-pub use otter_support::imports::*;
+pub use otter_support::crates::*;
 pub use otter_support::prelude_part::*;
 

diff --git a/src/spec.rs b/src/spec.rs
index 5cb6985e96d3b15fae8260fb35e19f9b82c08bc8..f933dada352bfb15e5fba1e55c5723ea740d40b7 100644 (file)
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -4,9 +4,9 @@
 
 // game specs
 
-use crate::imports::*;
-use otter_support::imports::*;
-use otter_base::imports::*;
+use crate::crates::*;
+use otter_support::crates::*;
+use otter_base::crates::*;
 
 use std::borrow::Cow;
 use std::collections::hash_map::HashMap;

diff --git a/src/toml-de.rs b/src/toml-de.rs
index 589938d0b2f01a5322e59c8f838b0349ae1772bc..e48a57a9aa26682caec7e5728d36d11bfe0dbd0e 100644 (file)
--- a/src/toml-de.rs
+++ b/src/toml-de.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-use crate::imports::*;
-use otter_support::imports::*;
-use otter_base::imports::*;
+use crate::crates::*;
+use otter_support::crates::*;
+use otter_base::crates::*;
 
 use std::fmt::{Debug, Display};
 use std::iter::Peekable;

diff --git a/src/utils.rs b/src/utils.rs
index c50e756e77e985560ba7552ced46b59785238414..439892b174bfa70522b025690b6d2f3f87fd5070 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -4,7 +4,7 @@
 
 use crate::prelude::*;
 
-pub use otter_base::imports::extend::ext;
+pub use otter_base::crates::extend::ext;
 
 //========== miscellany ==========
 // (roughly in order of implementation length)

diff --git a/support/imports.rs b/support/crates.rs
similarity index 100%
rename from support/imports.rs
rename to support/crates.rs

diff --git a/support/lib.rs b/support/lib.rs
index d06e385f2260fa78231c5dd7437d10b557bb06f5..66368289b2e6eca701aacb880923988b6c666f70 100644 (file)
--- a/support/lib.rs
+++ b/support/lib.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub mod imports;
+pub mod crates;
 pub mod prelude;
 
 #[path="prelude-part.rs"]

diff --git a/support/prelude.rs b/support/prelude.rs
index 2aa0399dcc36c820d494741f7f382a2685acf5e3..c4cb616ce8c33109a1d514b336132f13f0577521 100644 (file)
--- a/support/prelude.rs
+++ b/support/prelude.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub use crate::imports::*;
+pub use crate::crates::*;
 pub use crate::prelude_part::*;
 
-pub use otter_base::imports::*;
+pub use otter_base::crates::*;
 pub use otter_base::prelude_part::*;
 

diff --git a/wasm/wasm.rs b/wasm/wasm.rs
index 89e5969044f3cb3c822f9c6301c1b1df4e67b47f..88c29d63912d6e6963e00b833062210858efff2c 100644 (file)
--- a/wasm/wasm.rs
+++ b/wasm/wasm.rs
@@ -10,7 +10,7 @@
 
 #![allow(clippy::unused_unit)] // #[wasm_bindgen] produces these?
 
-use otter_base::imports::*;
+use otter_base::crates::*;
 
 use std::fmt::Display;
 use std::collections::hash_map::HashMap;
@@ -22,7 +22,7 @@ use js_sys::JsString;
 use thiserror::Error;
 use wasm_bindgen::prelude::*;
 
-use otter_base::imports::serde_json;
+use otter_base::crates::serde_json;
 
 use otter_base::geometry::{PosC,RegionC};
 use otter_base::zcoord;