From e7c70929bac23804c392d1f552eb914dda390ef0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 May 2022 18:01:55 +0100 Subject: [PATCH] crate structure: Rename "prelude-part" to "imports" This is less clumsy. Signed-off-by: Ian Jackson --- base/{prelude-part.rs => imports.rs} | 0 base/lib.rs | 4 +--- base/prelude.rs | 2 +- src/{prelude-part.rs => imports.rs} | 2 +- src/lib.rs | 4 +--- src/prelude.rs | 6 +++--- support/{prelude-part.rs => imports.rs} | 0 support/lib.rs | 4 +--- support/prelude.rs | 4 ++-- 9 files changed, 10 insertions(+), 16 deletions(-) rename base/{prelude-part.rs => imports.rs} (100%) rename src/{prelude-part.rs => imports.rs} (99%) rename support/{prelude-part.rs => imports.rs} (100%) 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 5d1ebcd4..fe6faf85 100644 --- 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 b27ff729..3f02473c 100644 --- 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 45b4f0a2..19117252 100644 --- 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 c61b076d..d8eaa5df 100644 --- 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 d30fa180..de102f01 100644 --- 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 66368289..0e23acac 100644 --- 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 c4cb616c..8935289a 100644 --- 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::*; -- 2.30.2