Skip to content

Commit 32d4ea0

Browse files
committed
Implement AsRef<Module> and have Context::install take it
1 parent d035a36 commit 32d4ea0

40 files changed

+102
-90
lines changed

crates/rune-cli/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,11 @@ impl SharedFlags {
260260
let mut context = rune_modules::default_context()?;
261261

262262
if self.experimental {
263-
context.install(&rune_modules::experiments::module(true)?)?;
263+
context.install(rune_modules::experiments::module(true)?)?;
264264
}
265265

266266
if c.test {
267-
context.install(&benches::test_module()?)?;
267+
context.install(benches::test_module()?)?;
268268
}
269269

270270
Ok(context)
@@ -274,14 +274,14 @@ impl SharedFlags {
274274
fn context_with_capture(&self, c: &Config, io: &CaptureIo) -> Result<Context, ContextError> {
275275
let mut context = rune_modules::with_config(false)?;
276276

277-
context.install(&rune_modules::capture_io::module(io)?)?;
277+
context.install(rune_modules::capture_io::module(io)?)?;
278278

279279
if self.experimental {
280-
context.install(&rune_modules::experiments::module(true)?)?;
280+
context.install(rune_modules::experiments::module(true)?)?;
281281
}
282282

283283
if c.test {
284-
context.install(&benches::test_module()?)?;
284+
context.install(benches::test_module()?)?;
285285
}
286286

287287
Ok(context)

crates/rune-languageserver/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn main() -> Result<()> {
9595
}
9696

9797
let mut context = rune_modules::default_context()?;
98-
context.install(&rune_modules::experiments::module(true)?)?;
98+
context.install(rune_modules::experiments::module(true)?)?;
9999

100100
let mut options = Options::default();
101101
options.macros(true);

crates/rune-macros/tests/test_rename.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn test_rename() {
1818
module.ty::<Bar>().unwrap();
1919

2020
let mut context = Context::new();
21-
let e = context.install(&module).unwrap_err();
21+
let e = context.install(module).unwrap_err();
2222

2323
match e {
2424
ContextError::ConflictingType { item, .. } => {

crates/rune-modules/src/capture_io.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//! # fn main() -> Result<(), ContextError> {
88
//! let io = CaptureIo::new();
99
//!
10-
//! let mut c = rune_modules::with_config(false)?;
11-
//! c.install(&capture_io::module(&io)?)?;
10+
//! let mut context = rune_modules::with_config(false)?;
11+
//! context.install(capture_io::module(&io)?)?;
1212
//! # Ok(()) }
1313
//! ```
1414

crates/rune-modules/src/disable_io.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//! use rune_modules::disable_io;
66
//!
77
//! # fn main() -> Result<(), ContextError> {
8-
//! let mut c = rune_modules::with_config(false)?;
9-
//! c.install(&disable_io::module()?)?;
8+
//! let mut context = rune_modules::with_config(false)?;
9+
//! context.install(disable_io::module()?)?;
1010
//! # Ok(()) }
1111
//! ```
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! ```rust
1616
//! # fn main() -> rune::Result<()> {
1717
//! let mut context = rune::Context::with_default_modules()?;
18-
//! context.install(&rune_modules::experiments::module(true)?)?;
18+
//! context.install(rune_modules::experiments::module(true)?)?;
1919
//! # Ok(())
2020
//! # }
2121
//! ```

crates/rune-modules/src/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! ```rust
1616
//! # fn main() -> rune::Result<()> {
1717
//! let mut context = rune::Context::with_default_modules()?;
18-
//! context.install(&rune_modules::fs::module(true)?)?;
18+
//! context.install(rune_modules::fs::module(true)?)?;
1919
//! # Ok(())
2020
//! # }
2121
//! ```

crates/rune-modules/src/http.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
//! ```rust
1616
//! # fn main() -> rune::Result<()> {
1717
//! let mut context = rune::Context::with_default_modules()?;
18-
//! context.install(&rune_modules::http::module(true)?)?;
19-
//! context.install(&rune_modules::json::module(true)?)?;
18+
//! context.install(rune_modules::http::module(true)?)?;
19+
//! context.install(rune_modules::json::module(true)?)?;
2020
//! # Ok(())
2121
//! # }
2222
//! ```

crates/rune-modules/src/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! ```rust
1616
//! # fn main() -> rune::Result<()> {
1717
//! let mut context = rune::Context::with_default_modules()?;
18-
//! context.install(&rune_modules::json::module(true)?)?;
18+
//! context.install(rune_modules::json::module(true)?)?;
1919
//! # Ok(())
2020
//! # }
2121
//! ```

crates/rune-modules/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ macro_rules! modules {
106106
#[allow(deprecated)]
107107
#[cfg(feature = $name)]
108108
{
109-
context.install(&self::$ident::module(stdio)?)?;
109+
context.install(self::$ident::module(stdio)?)?;
110110
}
111111
)*
112112

0 commit comments

Comments
 (0)