crate structure: Rename "prelude-part" to "imports"

This is less clumsy.

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

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

diff --git a/base/lib.rs b/base/lib.rs
index 5d1ebcd4db60b3bd2aca2731c554949356e817e8..fe6faf854fac1f68faf5fe618b6a8ca808d594c5 100644 (file)
--- a/base/lib.rs
+++ b/base/lib.rs
@@ -12,11 +12,9 @@
 #![allow(clippy::writeln_empty_string)]
 
 pub mod crates;
+pub mod imports;
 pub mod prelude;
 
-#[path="prelude-part.rs"]
-pub mod prelude_part;
-
 pub mod geometry;
 pub mod html;
 pub mod zcoord;

diff --git a/base/prelude.rs b/base/prelude.rs
index b27ff729d8c860691af0c19eae6e67cf836d6a93..3f02473ccd71442fbaa24407adce87d80ebedd2b 100644 (file)
--- a/base/prelude.rs
+++ b/base/prelude.rs
@@ -3,4 +3,4 @@
 // There is NO WARRANTY.
 
 pub use crate::crates::*;
-pub use crate::prelude_part::*;
+pub use crate::imports::*;

diff --git a/src/prelude-part.rs b/src/imports.rs
similarity index 99%
rename from src/prelude-part.rs
rename to src/imports.rs
index 45b4f0a2340a78a3f81110b0c4b76a760bdca8c1..19117252dcf7b7bb3e423711900704ebac57cbcb 100644 (file)
--- a/src/prelude-part.rs
+++ b/src/imports.rs
@@ -6,7 +6,7 @@ use crate::crates::*;
 use otter_support::crates::*;
 use otter_base::crates::*;
 
-use otter_base::prelude_part::*;
+use otter_base::imports::*;
 
 pub use std::any::Any;
 pub use std::borrow::Cow;

diff --git a/src/lib.rs b/src/lib.rs
index c61b076dd05d33274c4ec756c5d9135c4952e8f8..d8eaa5dfe8ed277391179adf9df77f0c2df6b830 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,11 +19,9 @@
 //! [build instructions](https://www.chiark.greenend.org.uk/~ianmdlvl/otter/docs/build.html).
 
 pub mod crates;
+pub mod imports;
 pub mod prelude;
 
-#[path="prelude-part.rs"]
-pub mod prelude_part;
-
 pub mod accounts;
 pub mod asseturl;
 pub mod authproofs;

diff --git a/src/prelude.rs b/src/prelude.rs
index d30fa1809d956d1ed7f391f337309be7e1e9bc24..de102f01c95b83f38e557331c8fc4f2692366411 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -3,11 +3,11 @@
 // There is NO WARRANTY.
 
 pub use crate::crates::*;
-pub use crate::prelude_part::*;
+pub use crate::imports::*;
 
 pub use otter_base::crates::*;
-pub use otter_base::prelude_part::*;
+pub use otter_base::imports::*;
 
 pub use otter_support::crates::*;
-pub use otter_support::prelude_part::*;
+pub use otter_support::imports::*;
 

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

diff --git a/support/lib.rs b/support/lib.rs
index 66368289b2e6eca701aacb880923988b6c666f70..0e23acacb749601676e48d10419cadc951903b84 100644 (file)
--- a/support/lib.rs
+++ b/support/lib.rs
@@ -3,11 +3,9 @@
 // There is NO WARRANTY.
 
 pub mod crates;
+pub mod imports;
 pub mod prelude;
 
-#[path="prelude-part.rs"]
-pub mod prelude_part;
-
 pub mod support;
 
 #[path="../src/tz.rs"] pub mod tz;

diff --git a/support/prelude.rs b/support/prelude.rs
index c4cb616ce8c33109a1d514b336132f13f0577521..8935289aeb762f086da207ca00bbb968da6ea66d 100644 (file)
--- a/support/prelude.rs
+++ b/support/prelude.rs
@@ -3,8 +3,8 @@
 // There is NO WARRANTY.
 
 pub use crate::crates::*;
-pub use crate::prelude_part::*;
+pub use crate::imports::*;
 
 pub use otter_base::crates::*;
-pub use otter_base::prelude_part::*;
+pub use otter_base::imports::*;