Implement AsRef<Module> and have Context::install take it

Author: udoprog

crates/rune-cli/src/main.rs

@@ -260,11 +260,11 @@ impl SharedFlags {
         let mut context = rune_modules::default_context()?;
 
         if self.experimental {
-            context.install(&rune_modules::experiments::module(true)?)?;
+            context.install(rune_modules::experiments::module(true)?)?;
         }
 
         if c.test {
-            context.install(&benches::test_module()?)?;
+            context.install(benches::test_module()?)?;
         }
 
         Ok(context)
@@ -274,14 +274,14 @@ impl SharedFlags {
     fn context_with_capture(&self, c: &Config, io: &CaptureIo) -> Result<Context, ContextError> {
         let mut context = rune_modules::with_config(false)?;
 
-        context.install(&rune_modules::capture_io::module(io)?)?;
+        context.install(rune_modules::capture_io::module(io)?)?;
 
         if self.experimental {
-            context.install(&rune_modules::experiments::module(true)?)?;
+            context.install(rune_modules::experiments::module(true)?)?;
         }
 
         if c.test {
-            context.install(&benches::test_module()?)?;
+            context.install(benches::test_module()?)?;
         }
 
         Ok(context)

crates/rune-languageserver/src/main.rs

@@ -95,7 +95,7 @@ fn main() -> Result<()> {
     }
 
     let mut context = rune_modules::default_context()?;
-    context.install(&rune_modules::experiments::module(true)?)?;
+    context.install(rune_modules::experiments::module(true)?)?;
 
     let mut options = Options::default();
     options.macros(true);

crates/rune-macros/tests/test_rename.rs

@@ -18,7 +18,7 @@ fn test_rename() {
     module.ty::<Bar>().unwrap();
 
     let mut context = Context::new();
-    let e = context.install(&module).unwrap_err();
+    let e = context.install(module).unwrap_err();
 
     match e {
         ContextError::ConflictingType { item, .. } => {

crates/rune-modules/src/capture_io.rs

@@ -7,8 +7,8 @@
 //! # fn main() -> Result<(), ContextError> {
 //! let io = CaptureIo::new();
 //!
-//! let mut c = rune_modules::with_config(false)?;
-//! c.install(&capture_io::module(&io)?)?;
+//! let mut context = rune_modules::with_config(false)?;
+//! context.install(capture_io::module(&io)?)?;
 //! # Ok(()) }
 //! ```
 

crates/rune-modules/src/disable_io.rs

@@ -5,8 +5,8 @@
 //! use rune_modules::disable_io;
 //!
 //! # fn main() -> Result<(), ContextError> {
-//! let mut c = rune_modules::with_config(false)?;
-//! c.install(&disable_io::module()?)?;
+//! let mut context = rune_modules::with_config(false)?;
+//! context.install(disable_io::module()?)?;
 //! # Ok(()) }
 //! ```
 

crates/rune-modules/src/experiments/mod.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::experiments::module(true)?)?;
+//! context.install(rune_modules::experiments::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/fs.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::fs::module(true)?)?;
+//! context.install(rune_modules::fs::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/http.rs

@@ -15,8 +15,8 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::http::module(true)?)?;
-//! context.install(&rune_modules::json::module(true)?)?;
+//! context.install(rune_modules::http::module(true)?)?;
+//! context.install(rune_modules::json::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/json.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::json::module(true)?)?;
+//! context.install(rune_modules::json::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/lib.rs

@@ -106,7 +106,7 @@ macro_rules! modules {
                 #[allow(deprecated)]
                 #[cfg(feature = $name)]
                 {
-                    context.install(&self::$ident::module(stdio)?)?;
+                    context.install(self::$ident::module(stdio)?)?;
                 }
             )*
 

crates/rune-modules/src/process.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::process::module(true)?)?;
+//! context.install(rune_modules::process::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/rand.rs

@@ -16,7 +16,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::rand::module(true)?)?;
+//! context.install(rune_modules::rand::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/signal.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::signal::module(true)?)?;
+//! context.install(rune_modules::signal::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/time.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::time::module(true)?)?;
+//! context.install(rune_modules::time::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-modules/src/toml.rs

@@ -15,7 +15,7 @@
 //! ```rust
 //! # fn main() -> rune::Result<()> {
 //! let mut context = rune::Context::with_default_modules()?;
-//! context.install(&rune_modules::toml::module(true)?)?;
+//! context.install(rune_modules::toml::module(true)?)?;
 //! # Ok(())
 //! # }
 //! ```

crates/rune-wasm/src/lib.rs

@@ -149,15 +149,15 @@ impl WasmCompileResult {
 fn setup_context(experimental: bool, io: &CaptureIo) -> Result<Context, ContextError> {
     let mut context = Context::with_config(false)?;
 
-    context.install(&rune_modules::capture_io::module(io)?)?;
-    context.install(&time::module()?)?;
-    context.install(&http::module()?)?;
-    context.install(&rune_modules::json::module(false)?)?;
-    context.install(&rune_modules::toml::module(false)?)?;
-    context.install(&rune_modules::rand::module(false)?)?;
+    context.install(rune_modules::capture_io::module(io)?)?;
+    context.install(time::module()?)?;
+    context.install(http::module()?)?;
+    context.install(rune_modules::json::module(false)?)?;
+    context.install(rune_modules::toml::module(false)?)?;
+    context.install(rune_modules::rand::module(false)?)?;
 
     if experimental {
-        context.install(&rune_modules::experiments::module(false)?)?;
+        context.install(rune_modules::experiments::module(false)?)?;
     }
 
     Ok(context)

crates/rune/src/ast/mod.rs

@@ -26,7 +26,7 @@
 //! m.macro_(["ident_to_string"], ident_to_string)?;
 //!
 //! let mut context = Context::new();
-//! context.install(&m)?;
+//! context.install(m)?;
 //!
 //! let runtime = Arc::new(context.runtime());
 //!

crates/rune/src/compile/context.rs

@@ -228,29 +228,29 @@ impl Context {
     /// * `::std::io::println`
     pub fn with_config(stdio: bool) -> Result<Self, ContextError> {
         let mut this = Self::new();
-        this.install(&crate::modules::any::module()?)?;
-        this.install(&crate::modules::bytes::module()?)?;
-        this.install(&crate::modules::char::module()?)?;
-        this.install(&crate::modules::cmp::module()?)?;
-        this.install(&crate::modules::collections::module()?)?;
-        this.install(&crate::modules::core::module()?)?;
-        this.install(&crate::modules::float::module()?)?;
-        this.install(&crate::modules::fmt::module()?)?;
-        this.install(&crate::modules::future::module()?)?;
-        this.install(&crate::modules::generator::module()?)?;
-        this.install(&crate::modules::int::module()?)?;
-        this.install(&crate::modules::io::module(stdio)?)?;
-        this.install(&crate::modules::iter::module()?)?;
-        this.install(&crate::modules::macros::module()?)?;
-        this.install(&crate::modules::mem::module()?)?;
-        this.install(&crate::modules::object::module()?)?;
-        this.install(&crate::modules::ops::module()?)?;
-        this.install(&crate::modules::option::module()?)?;
-        this.install(&crate::modules::result::module()?)?;
-        this.install(&crate::modules::stream::module()?)?;
-        this.install(&crate::modules::string::module()?)?;
-        this.install(&crate::modules::test::module()?)?;
-        this.install(&crate::modules::vec::module()?)?;
+        this.install(crate::modules::any::module()?)?;
+        this.install(crate::modules::bytes::module()?)?;
+        this.install(crate::modules::char::module()?)?;
+        this.install(crate::modules::cmp::module()?)?;
+        this.install(crate::modules::collections::module()?)?;
+        this.install(crate::modules::core::module()?)?;
+        this.install(crate::modules::float::module()?)?;
+        this.install(crate::modules::fmt::module()?)?;
+        this.install(crate::modules::future::module()?)?;
+        this.install(crate::modules::generator::module()?)?;
+        this.install(crate::modules::int::module()?)?;
+        this.install(crate::modules::io::module(stdio)?)?;
+        this.install(crate::modules::iter::module()?)?;
+        this.install(crate::modules::macros::module()?)?;
+        this.install(crate::modules::mem::module()?)?;
+        this.install(crate::modules::object::module()?)?;
+        this.install(crate::modules::ops::module()?)?;
+        this.install(crate::modules::option::module()?)?;
+        this.install(crate::modules::result::module()?)?;
+        this.install(crate::modules::stream::module()?)?;
+        this.install(crate::modules::string::module()?)?;
+        this.install(crate::modules::test::module()?)?;
+        this.install(crate::modules::vec::module()?)?;
         this.has_default_modules = true;
         Ok(this)
     }
@@ -287,7 +287,12 @@ impl Context {
     /// This installs everything that has been declared in the given [Module]
     /// and ensures that they are compatible with the overall context, like
     /// ensuring that a given type is only declared once.
-    pub fn install(&mut self, module: &Module) -> Result<(), ContextError> {
+    pub fn install<M>(&mut self, module: M) -> Result<(), ContextError>
+    where
+        M: AsRef<Module>,
+    {
+        let module = module.as_ref();
+
         if let Some(id) = module.unique {
             if !self.unique.insert(id) {
                 return Ok(());

crates/rune/src/compile/module.rs

@@ -343,7 +343,7 @@ impl Module {
     /// module.inst_fn("len", MyBytes::len)?;
     ///
     /// let mut context = rune::Context::new();
-    /// assert!(context.install(&module).is_err());
+    /// assert!(context.install(module).is_err());
     ///
     /// // Register `len` properly.
     /// let mut module = rune::Module::default();
@@ -352,7 +352,7 @@ impl Module {
     /// module.inst_fn("len", MyBytes::len)?;
     ///
     /// let mut context = rune::Context::new();
-    /// assert!(context.install(&module).is_ok());
+    /// assert!(context.install(module).is_ok());
     /// # Ok(()) }
     /// ```
     pub fn ty<T>(&mut self) -> Result<(), ContextError>
@@ -849,7 +849,7 @@ impl Module {
     /// module.inst_fn("len", MyBytes::len)?;
     ///
     /// let mut context = rune::Context::new();
-    /// context.install(&module)?;
+    /// context.install(module)?;
     /// # Ok(()) }
     /// ```
     pub fn inst_fn<N, Func, Args>(&mut self, name: N, f: Func) -> Result<(), ContextError>
@@ -986,6 +986,13 @@ impl Module {
     }
 }
 
+impl AsRef<Module> for Module {
+    #[inline]
+    fn as_ref(&self) -> &Module {
+        self
+    }
+}
+
 /// Trait used to provide the [function][Module::function] function.
 pub trait Function<Args>: 'static + Send + Sync {
     /// The return type of the function.

crates/rune/src/macros/mod.rs

@@ -42,7 +42,7 @@
 //! m.macro_(["concat_idents"], concat_idents)?;
 //!
 //! let mut context = Context::new();
-//! context.install(&m)?;
+//! context.install(m)?;
 //!
 //! let runtime = Arc::new(context.runtime());
 //!

examples/examples/checked_add_assign.rs

@@ -25,7 +25,7 @@ fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
     let runtime = Arc::new(context.runtime());
 
     let mut sources = rune::sources! {

examples/examples/concat_idents.rs

@@ -33,7 +33,7 @@ fn main() -> rune::Result<()> {
     m.macro_(["concat_idents"], concat_idents)?;
 
     let mut context = Context::new();
-    context.install(&m)?;
+    context.install(m)?;
 
     let runtime = Arc::new(context.runtime());
 

examples/examples/custom_instance_fn.rs

@@ -11,7 +11,7 @@ async fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
     let runtime = Arc::new(context.runtime());
 
     let mut sources = rune::sources!(entry => {

examples/examples/custom_mul.rs

@@ -22,7 +22,7 @@ fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
 
     let runtime = Arc::new(context.runtime());
 

examples/examples/external_enum.rs

@@ -25,7 +25,7 @@ fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
     let runtime = Arc::new(context.runtime());
 
     let mut sources = rune::sources! {

examples/examples/native_function.rs

@@ -6,7 +6,7 @@ fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
 
     let runtime = Arc::new(context.runtime());
 

examples/examples/parsing_in_macro.rs

@@ -9,7 +9,7 @@ pub fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
     let runtime = Arc::new(context.runtime());
 
     let mut sources = rune::sources! {

examples/examples/references.rs

@@ -21,7 +21,7 @@ fn main() -> rune::Result<()> {
     module.inst_fn(Protocol::ADD_ASSIGN, Foo::add_assign)?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&module)?;
+    context.install(module)?;
 
     let runtime = Arc::new(context.runtime());
 

examples/examples/simple_external.rs

@@ -19,7 +19,7 @@ fn main() -> rune::Result<()> {
     let m = module()?;
 
     let mut context = rune_modules::default_context()?;
-    context.install(&m)?;
+    context.install(m)?;
     let runtime = Arc::new(context.runtime());
 
     let mut sources = rune::sources! {