summaryrefslogtreecommitdiff
path: root/core/modules.rs
diff options
context:
space:
mode:
Diffstat (limited to 'core/modules.rs')
-rw-r--r--core/modules.rs49
1 files changed, 12 insertions, 37 deletions
diff --git a/core/modules.rs b/core/modules.rs
index 3caeab7b1..57068528d 100644
--- a/core/modules.rs
+++ b/core/modules.rs
@@ -441,7 +441,6 @@ impl Modules {
mod tests {
use super::*;
use crate::js_check;
- use crate::BasicState;
use crate::JsRuntime;
use crate::StartupData;
use futures::future::FutureExt;
@@ -620,12 +619,8 @@ mod tests {
fn test_recursive_load() {
let loader = MockLoader::new();
let loads = loader.loads.clone();
- let mut runtime = JsRuntime::new_with_loader(
- loader,
- BasicState::new(),
- StartupData::None,
- false,
- );
+ let mut runtime =
+ JsRuntime::new_with_loader(loader, StartupData::None, false);
let spec = ModuleSpecifier::resolve_url("file:///a.js").unwrap();
let a_id_fut = runtime.load_module(&spec, None);
let a_id = futures::executor::block_on(a_id_fut).expect("Failed to load");
@@ -687,12 +682,8 @@ mod tests {
fn test_circular_load() {
let loader = MockLoader::new();
let loads = loader.loads.clone();
- let mut runtime = JsRuntime::new_with_loader(
- loader,
- BasicState::new(),
- StartupData::None,
- false,
- );
+ let mut runtime =
+ JsRuntime::new_with_loader(loader, StartupData::None, false);
let fut = async move {
let spec = ModuleSpecifier::resolve_url("file:///circular1.js").unwrap();
@@ -765,12 +756,8 @@ mod tests {
fn test_redirect_load() {
let loader = MockLoader::new();
let loads = loader.loads.clone();
- let mut runtime = JsRuntime::new_with_loader(
- loader,
- BasicState::new(),
- StartupData::None,
- false,
- );
+ let mut runtime =
+ JsRuntime::new_with_loader(loader, StartupData::None, false);
let fut = async move {
let spec = ModuleSpecifier::resolve_url("file:///redirect1.js").unwrap();
@@ -834,12 +821,8 @@ mod tests {
run_in_task(|mut cx| {
let loader = MockLoader::new();
let loads = loader.loads.clone();
- let mut runtime = JsRuntime::new_with_loader(
- loader,
- BasicState::new(),
- StartupData::None,
- false,
- );
+ let mut runtime =
+ JsRuntime::new_with_loader(loader, StartupData::None, false);
let spec = ModuleSpecifier::resolve_url("file:///main.js").unwrap();
let mut recursive_load = runtime.load_module(&spec, None).boxed_local();
@@ -884,12 +867,8 @@ mod tests {
fn loader_disappears_after_error() {
run_in_task(|mut cx| {
let loader = MockLoader::new();
- let mut runtime = JsRuntime::new_with_loader(
- loader,
- BasicState::new(),
- StartupData::None,
- false,
- );
+ let mut runtime =
+ JsRuntime::new_with_loader(loader, StartupData::None, false);
let spec = ModuleSpecifier::resolve_url("file:///bad_import.js").unwrap();
let mut load_fut = runtime.load_module(&spec, None).boxed_local();
let result = load_fut.poll_unpin(&mut cx);
@@ -917,12 +896,8 @@ mod tests {
fn recursive_load_main_with_code() {
let loader = MockLoader::new();
let loads = loader.loads.clone();
- let mut runtime = JsRuntime::new_with_loader(
- loader,
- BasicState::new(),
- StartupData::None,
- false,
- );
+ let mut runtime =
+ JsRuntime::new_with_loader(loader, StartupData::None, false);
// In default resolution code should be empty.
// Instead we explicitly pass in our own code.
// The behavior should be very similar to /a.js.