Clean up

rune-rs · May 6, 2023 · fc61152 · fc61152
1 parent 6a57f4d
commit fc61152
Show file tree

Hide file tree

Showing 4 changed files with 1,047 additions and 1,019 deletions.
diff --git a/crates/rune-macros/src/context.rs b/crates/rune-macros/src/context.rs
@@ -625,11 +625,11 @@ impl Context {
             full_type_of: quote!(#module::runtime::FullTypeOf),
             hash: quote!(#module::Hash),
             id: quote!(#module::parse::Id),
-            install_with: quote!(#module::module::InstallWith),
+            install_with: quote!(#module::__private::InstallWith),
             macro_context: quote!(#module::macros::MacroContext),
             maybe_type_of: quote!(#module::runtime::MaybeTypeOf),
             module_variant: quote!(#module::module::Variant),
-            module: quote!(#module::module::Module),
+            module: quote!(#module::__private::Module),
             named: quote!(#module::compile::Named),
             object: quote!(#module::runtime::Object),
             opaque: quote!(#module::parse::Opaque),

diff --git a/crates/rune/src/lib.rs b/crates/rune/src/lib.rs
@@ -223,7 +223,9 @@ pub use self::compile::{Context, ContextError, Options};
 
 pub mod module;
 #[doc(inline)]
-pub use self::module::{InstallWith, Module};
+pub use self::module::module::Module;
+#[doc(inline)]
+pub use self::module::InstallWith;
 
 pub mod diagnostics;
 #[doc(inline)]
@@ -292,6 +294,8 @@ mod collections {
 /// Privately exported details.
 #[doc(hidden)]
 pub mod __private {
+    pub use crate::module::module::Module;
+    pub use crate::module::InstallWith;
     pub use crate::module::{FunctionMetaData, FunctionMetaKind};
     pub use crate::module::{MacroMetaData, MacroMetaKind};
 }