8 files changed, 18 insertions, 17 deletions
diff --git a/core/examples/disable_ops.rs b/core/examples/disable_ops.rs
index b9a5e7fca..c75af1c3f 100644
--- a/core/examples/disable_ops.rs
+++ b/core/examples/disable_ops.rs
@@ -22,6 +22,6 @@ fn main() {
 
   // Deno.core.print() will now be a NOP
   runtime
-    .execute_script("<usage>", r#"Deno.core.print("I'm broken")"#)
+    .execute_script_static("<usage>", r#"Deno.core.print("I'm broken")"#)
     .unwrap();
 }
diff --git a/core/examples/eval_js_value.rs b/core/examples/eval_js_value.rs
index e5b823a09..7b7af7c96 100644
--- a/core/examples/eval_js_value.rs
+++ b/core/examples/eval_js_value.rs
@@ -28,7 +28,7 @@ fn eval(
   context: &mut JsRuntime,
   code: &'static str,
 ) -> Result<serde_json::Value, String> {
-  let res = context.execute_script("<anon>", code);
+  let res = context.execute_script_static("<anon>", code);
   match res {
     Ok(global) => {
       let scope = &mut context.handle_scope();
diff --git a/core/examples/hello_world.rs b/core/examples/hello_world.rs
index 50cbe4e2c..cce6e2218 100644
--- a/core/examples/hello_world.rs
+++ b/core/examples/hello_world.rs
@@ -41,7 +41,7 @@ fn main() {
   // contains a Deno.core object with several functions for interacting with it.
   // You can find its definition in core.js.
   runtime
-    .execute_script(
+    .execute_script_static(
       "<usage>",
       r#"
 // Print helper function, calling Deno.core.print()
diff --git a/core/examples/http_bench_json_ops/main.rs b/core/examples/http_bench_json_ops/main.rs
index f0bbec0d9..7c15f7bf2 100644
--- a/core/examples/http_bench_json_ops/main.rs
+++ b/core/examples/http_bench_json_ops/main.rs
@@ -165,7 +165,7 @@ fn main() {
     js_runtime
       .execute_script(
         "http_bench_json_ops.js",
-        include_str!("http_bench_json_ops.js"),
+        include_ascii_string!("http_bench_json_ops.js"),
       )
       .unwrap();
     js_runtime.run_event_loop(false).await
diff --git a/core/examples/panik.rs b/core/examples/panik.rs
index 1d2286a88..54b46d337 100644
--- a/core/examples/panik.rs
+++ b/core/examples/panik.rs
@@ -31,6 +31,6 @@ fn main() {
     extensions,
     ..Default::default()
   });
-  rt.execute_script("panik", "Deno.core.ops.op_panik()")
+  rt.execute_script_static("panik", "Deno.core.ops.op_panik()")
     .unwrap();
 }
diff --git a/core/examples/schedule_task.rs b/core/examples/schedule_task.rs
index 42d00022d..348ba7666 100644
--- a/core/examples/schedule_task.rs
+++ b/core/examples/schedule_task.rs
@@ -50,7 +50,7 @@ fn main() {
   let future = async move {
     // Schedule 10 tasks.
     js_runtime
-      .execute_script(
+      .execute_script_static(
         "<usage>",
         r#"for (let i = 1; i <= 10; i++) Deno.core.ops.op_schedule_task(i);"#,
       )
diff --git a/core/examples/ts_module_loader.rs b/core/examples/ts_module_loader.rs
index 4a38073ab..6adb27977 100644
--- a/core/examples/ts_module_loader.rs
+++ b/core/examples/ts_module_loader.rs
@@ -14,6 +14,7 @@ use anyhow::Error;
 use deno_ast::MediaType;
 use deno_ast::ParseParams;
 use deno_ast::SourceTextInfo;
+use deno_core::error::AnyError;
 use deno_core::resolve_import;
 use deno_core::resolve_path;
 use deno_core::JsRuntime;
@@ -41,11 +42,12 @@ impl ModuleLoader for TypescriptModuleLoader {
   fn load(
     &self,
     module_specifier: &ModuleSpecifier,
-    _maybe_referrer: Option<ModuleSpecifier>,
+    _maybe_referrer: Option<&ModuleSpecifier>,
     _is_dyn_import: bool,
   ) -> Pin<Box<ModuleSourceFuture>> {
-    let module_specifier = module_specifier.clone();
-    async move {
+    fn load(
+      module_specifier: &ModuleSpecifier,
+    ) -> Result<ModuleSource, AnyError> {
       let path = module_specifier
         .to_file_path()
         .map_err(|_| anyhow!("Only file:// URLs are supported."))?;
@@ -81,15 +83,14 @@ impl ModuleLoader for TypescriptModuleLoader {
       } else {
         code
       };
-      let module = ModuleSource {
-        code: code.into(),
+      Ok(ModuleSource::new(
         module_type,
-        module_url_specified: module_specifier.to_string(),
-        module_url_found: module_specifier.to_string(),
-      };
-      Ok(module)
+        code.into(),
+        module_specifier,
+      ))
     }
-    .boxed_local()
+
+    futures::future::ready(load(module_specifier)).boxed_local()
   }
 }
 
diff --git a/core/examples/wasm.rs b/core/examples/wasm.rs
index 7c2d98bc9..5d5c5f6ff 100644
--- a/core/examples/wasm.rs
+++ b/core/examples/wasm.rs
@@ -62,6 +62,6 @@ fn main() {
   });
 
   runtime
-    .execute_script("<usage>", include_str!("wasm.js"))
+    .execute_script("<usage>", include_ascii_string!("wasm.js"))
     .unwrap();
 }