Separate build-time Context and RuntimeContext

README.md

@@ -108,7 +108,7 @@ use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let context = Arc::new(rune_modules::default_context()?);
+    let context = rune_modules::default_context()?;
     let options = rune::Options::default();
 
     let mut sources = rune::Sources::new();
@@ -125,7 +125,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let mut errors = rune::Errors::new();
     let mut warnings = rune::Warnings::new();
 
-    let unit = match rune::load_sources(&*context, &options, &mut sources, &mut errors, &mut warnings) {
+    let unit = match rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings) {
         Ok(unit) => unit,
         Err(rune::LoadSourcesError) => {
             let mut writer = StandardStream::stderr(ColorChoice::Always);
@@ -139,7 +139,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         warnings.emit_diagnostics(&mut writer, &sources)?;
     }
 
-    let vm = Vm::new(context.clone(), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 
     let mut execution = vm.execute(&["calculate"], (10i64, 20i64))?;
     let value = execution.async_complete().await?;

crates/rune-cli/src/main.rs

@@ -266,7 +266,7 @@ async fn run_path(args: &Args, options: &rune::Options, path: &Path) -> Result<E
     let source = runestick::Source::from_path(path)
         .with_context(|| format!("reading file: {}", path.display()))?;
 
-    let context = Arc::new(context);
+    let runtime = Arc::new(context.runtime());
     let mut sources = rune::Sources::new();
 
     sources.insert(source);
@@ -297,7 +297,7 @@ async fn run_path(args: &Args, options: &rune::Options, path: &Path) -> Result<E
             let mut warnings = rune::Warnings::new();
 
             let unit = match rune::load_sources(
-                &*context,
+                &context,
                 &options,
                 &mut sources,
                 &mut errors,
@@ -324,7 +324,7 @@ async fn run_path(args: &Args, options: &rune::Options, path: &Path) -> Result<E
         }
     };
 
-    let vm = runestick::Vm::new(context.clone(), unit.clone());
+    let vm = runestick::Vm::new(runtime, unit.clone());
 
     if args.dump_native_functions {
         writeln!(out, "# functions")?;

crates/rune-wasm/src/lib.rs

@@ -190,7 +190,6 @@ async fn inner_compile(input: String, config: JsValue) -> Result<CompileResult,
 
     let context = setup_context(config.experimental)?;
 
-    let context = Arc::new(context);
     let mut options = rune::Options::default();
 
     for option in &config.options {
@@ -202,13 +201,7 @@ async fn inner_compile(input: String, config: JsValue) -> Result<CompileResult,
 
     let mut diagnostics = Vec::new();
 
-    let result = rune::load_sources(
-        &*context,
-        &options,
-        &mut sources,
-        &mut errors,
-        &mut warnings,
-    );
+    let result = rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings);
 
     for warning in &warnings {
         let span = warning.span();
@@ -340,7 +333,7 @@ async fn inner_compile(input: String, config: JsValue) -> Result<CompileResult,
         None
     };
 
-    let vm = runestick::Vm::new(context, unit);
+    let vm = runestick::Vm::new(Arc::new(context.runtime()), unit);
 
     let mut execution = match vm.execute(&["main"], ()) {
         Ok(execution) => execution,

crates/rune/README.md

@@ -108,7 +108,7 @@ use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let context = Arc::new(rune_modules::default_context()?);
+    let context = rune_modules::default_context()?;
     let options = rune::Options::default();
 
     let mut sources = rune::Sources::new();
@@ -125,7 +125,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let mut errors = rune::Errors::new();
     let mut warnings = rune::Warnings::new();
 
-    let unit = match rune::load_sources(&*context, &options, &mut sources, &mut errors, &mut warnings) {
+    let unit = match rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings) {
         Ok(unit) => unit,
         Err(rune::LoadSourcesError) => {
             let mut writer = StandardStream::stderr(ColorChoice::Always);
@@ -139,7 +139,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         warnings.emit_diagnostics(&mut writer, &sources)?;
     }
 
-    let vm = Vm::new(context.clone(), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 
     let mut execution = vm.execute(&["calculate"], (10i64, 20i64))?;
     let value = execution.async_complete().await?;

crates/rune/examples/basic_add.rs

@@ -25,7 +25,7 @@ fn main() -> runestick::Result<()> {
         &mut Warnings::disabled(),
     )?;
 
-    let vm = Vm::new(Arc::new(context), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
     let output = vm.execute(&["main"], (33i64,))?.complete()?;
     let output = i64::from_value(output)?;
 

crates/rune/examples/custom_instance_fn.rs

@@ -31,7 +31,7 @@ async fn main() -> runestick::Result<()> {
 
     let unit = rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings)?;
 
-    let vm = Vm::new(Arc::new(context), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
     let output = vm.execute(&["main"], (33i64,))?.complete()?;
     let output = i64::from_value(output)?;
 

crates/rune/examples/custom_mul.rs

@@ -47,7 +47,7 @@ fn main() -> runestick::Result<()> {
         &mut Warnings::disabled(),
     )?;
 
-    let vm = Vm::new(Arc::new(context), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
     let output = vm.execute(&["main"], (Foo { field: 5 },))?.complete()?;
     let output = Foo::from_value(output)?;
 

crates/rune/examples/run_diagnostics.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let context = Arc::new(rune_modules::default_context()?);
+    let context = rune_modules::default_context()?;
     let options = Options::default();
     let mut sources = Sources::new();
 
@@ -24,27 +24,22 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let mut warnings = Warnings::new();
     let mut errors = Errors::new();
 
-    let unit = match rune::load_sources(
-        &*context,
-        &options,
-        &mut sources,
-        &mut errors,
-        &mut warnings,
-    ) {
-        Ok(unit) => unit,
-        Err(rune::LoadSourcesError) => {
-            let mut writer = StandardStream::stderr(ColorChoice::Always);
-            errors.emit_diagnostics(&mut writer, &sources)?;
-            return Ok(());
-        }
-    };
+    let unit =
+        match rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings) {
+            Ok(unit) => unit,
+            Err(rune::LoadSourcesError) => {
+                let mut writer = StandardStream::stderr(ColorChoice::Always);
+                errors.emit_diagnostics(&mut writer, &sources)?;
+                return Ok(());
+            }
+        };
 
     if !warnings.is_empty() {
         let mut writer = StandardStream::stderr(ColorChoice::Always);
         warnings.emit_diagnostics(&mut writer, &sources)?;
     }
 
-    let vm = Vm::new(context.clone(), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 
     let mut execution = vm.execute(&["calculate"], (10i64, 20i64))?;
     let value = execution.async_complete().await?;

crates/rune/examples/run_minimal.rs

@@ -22,7 +22,7 @@ fn main() -> runestick::Result<()> {
         &mut Warnings::disabled(),
     )?;
 
-    let vm = runestick::Vm::new(Arc::new(context), Arc::new(unit));
+    let vm = runestick::Vm::new(Arc::new(context.runtime()), Arc::new(unit));
     let output = i64::from_value(vm.execute(&["main"], (1,))?.complete()?)?;
 
     println!("output: {}", output);

crates/rune/examples/tokio_spawn.rs

@@ -13,11 +13,8 @@ async fn main() -> runestick::Result<()> {
         "#,
     )?;
 
-    let context = Arc::new(context);
-
     let main = runestick::Hash::type_hash(&["main"]);
-
-    let vm = runestick::Vm::new(context.clone(), unit.clone());
+    let vm = runestick::Vm::new(Arc::new(context.runtime()), unit.clone());
 
     let execution = vm.clone().send_execute(main, (5,))?;
     let t1 = tokio::spawn(async move {

crates/rune/examples/use_references.rs

@@ -21,8 +21,6 @@ fn main() -> runestick::Result<()> {
     let mut context = Context::with_default_modules()?;
     context.install(&module)?;
 
-    let context = Arc::new(context);
-
     let mut sources = Sources::new();
     sources.insert(Source::new(
         "test",
@@ -43,7 +41,7 @@ fn main() -> runestick::Result<()> {
         &mut Warnings::disabled(),
     )?;
 
-    let vm = Vm::new(context, Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 
     let mut foo = Foo::default();
 

crates/rune/examples/vec_args.rs

@@ -35,7 +35,7 @@ fn main() -> runestick::Result<()> {
 
     let unit = rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings)?;
 
-    let vm = Vm::new(Arc::new(context), Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
     let _ = vm.execute(&["main"], ())?.complete()?;
 
     Ok(())

crates/rune/src/lib.rs

@@ -106,7 +106,7 @@
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     let context = Arc::new(rune_modules::default_context()?);
+//!     let context = rune_modules::default_context()?;
 //!     let options = rune::Options::default();
 //!
 //!     let mut sources = rune::Sources::new();
@@ -123,7 +123,7 @@
 //!     let mut errors = rune::Errors::new();
 //!     let mut warnings = rune::Warnings::new();
 //!
-//!     let unit = match rune::load_sources(&*context, &options, &mut sources, &mut errors, &mut warnings) {
+//!     let unit = match rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings) {
 //!         Ok(unit) => unit,
 //!         Err(rune::LoadSourcesError) => {
 //!             let mut writer = StandardStream::stderr(ColorChoice::Always);
@@ -137,7 +137,7 @@
 //!         warnings.emit_diagnostics(&mut writer, &sources)?;
 //!     }
 //!
-//!     let vm = Vm::new(context.clone(), Arc::new(unit));
+//!     let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 //!
 //!     let mut execution = vm.execute(&["calculate"], (10i64, 20i64))?;
 //!     let value = execution.async_complete().await?;

crates/rune/src/load/mod.rs

@@ -44,7 +44,7 @@ pub struct LoadSourcesError;
 /// use std::error::Error;
 ///
 /// # fn main() -> Result<(), Box<dyn Error>> {
-/// let context = Arc::new(rune_modules::default_context()?);
+/// let context = rune_modules::default_context()?;
 /// let mut options = rune::Options::default();
 /// let mut sources = rune::Sources::new();
 /// sources.insert(Source::new("entry", r#"
@@ -56,7 +56,7 @@ pub struct LoadSourcesError;
 /// let mut errors = rune::Errors::new();
 /// let mut warnings = rune::Warnings::new();
 ///
-/// let unit = match rune::load_sources(&*context, &options, &mut sources, &mut errors, &mut warnings) {
+/// let unit = match rune::load_sources(&context, &options, &mut sources, &mut errors, &mut warnings) {
 ///     Ok(unit) => unit,
 ///     Err(rune::LoadSourcesError) => {
 ///         let mut writer = StandardStream::stderr(ColorChoice::Always);
@@ -66,7 +66,7 @@ pub struct LoadSourcesError;
 /// };
 ///
 /// let unit = Arc::new(unit);
-/// let vm = runestick::Vm::new(context.clone(), unit.clone());
+/// let vm = runestick::Vm::new(Arc::new(context.runtime()), unit.clone());
 ///
 /// if !warnings.is_empty() {
 ///     let mut writer = StandardStream::stderr(ColorChoice::Always);

crates/rune/src/testing.rs

@@ -79,8 +79,9 @@ where
     T: FromValue,
 {
     let (unit, _) = compile_source(context, &source).map_err(RunError::Errors)?;
+    let context = Arc::new(context.runtime());
 
-    let vm = runestick::Vm::new(context.clone(), Arc::new(unit));
+    let vm = runestick::Vm::new(context, Arc::new(unit));
 
     let output = vm
         .execute(&Item::with_item(function), args)

crates/rune/tests/test_all/external_ops.rs

@@ -45,8 +45,6 @@ fn test_external_ops() {
             let mut context = Context::with_default_modules().unwrap();
             context.install(&module).unwrap();
 
-            let context = Arc::new(context);
-
             let mut sources = Sources::new();
             sources.insert(Source::new(
                 "test",
@@ -72,7 +70,7 @@ fn test_external_ops() {
             .unwrap();
             let unit = Arc::new(unit);
 
-            let vm = Vm::new(context, unit);
+            let vm = Vm::new(Arc::new(context.runtime()), unit);
 
             {
                 let mut foo = External::default();

crates/rune/tests/test_all/getter_setter.rs

@@ -18,8 +18,6 @@ fn test_getter_setter() {
     let mut context = Context::with_default_modules().unwrap();
     context.install(&module).unwrap();
 
-    let context = Arc::new(context);
-
     let mut sources = Sources::new();
     sources.insert(Source::new(
         "test",
@@ -42,7 +40,7 @@ fn test_getter_setter() {
     )
     .unwrap();
 
-    let vm = Vm::new(context, Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 
     let mut foo = Foo {
         number: 42,

crates/rune/tests/test_all/reference_error.rs

@@ -21,8 +21,6 @@ fn test_reference_error() {
     let mut context = Context::with_default_modules().unwrap();
     context.install(&module).unwrap();
 
-    let context = Arc::new(context);
-
     let mut sources = Sources::new();
     sources.insert(Source::new(
         "test",
@@ -40,7 +38,7 @@ fn test_reference_error() {
     )
     .unwrap();
 
-    let vm = Vm::new(context, Arc::new(unit));
+    let vm = Vm::new(Arc::new(context.runtime()), Arc::new(unit));
 
     let mut foo = Foo::default();
     assert_eq!(foo.value, 0);

crates/runestick/Cargo.toml

@@ -37,3 +37,4 @@ runestick-macros = {version = "0.7.0", path = "../runestick-macros"}
 [dev-dependencies]
 tokio = {version = "0.2.22", features = ["full"]}
 checkers = "0.5.6"
+static_assertions = "1.1.0"