diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Cargo.toml | 2 | ||||
| -rw-r--r-- | runtime/build.rs | 8 | ||||
| -rw-r--r-- | runtime/lib.rs | 1 | ||||
| -rw-r--r-- | runtime/permissions.rs | 2 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 6 | ||||
| -rw-r--r-- | runtime/worker.rs | 3 |
6 files changed, 11 insertions, 11 deletions
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 6333d3387..1763d6feb 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -30,7 +30,6 @@ deno_fetch = { version = "0.59.0", path = "../ext/fetch" } deno_ffi = { version = "0.23.0", path = "../ext/ffi" } deno_http = { version = "0.28.0", path = "../ext/http" } deno_net = { version = "0.28.0", path = "../ext/net" } -deno_timers = { version = "0.34.0", path = "../ext/timers" } deno_tls = { version = "0.23.0", path = "../ext/tls" } deno_url = { version = "0.36.0", path = "../ext/url" } deno_web = { version = "0.67.0", path = "../ext/web" } @@ -54,7 +53,6 @@ deno_fetch = { version = "0.59.0", path = "../ext/fetch" } deno_ffi = { version = "0.23.0", path = "../ext/ffi" } deno_http = { version = "0.28.0", path = "../ext/http" } deno_net = { version = "0.28.0", path = "../ext/net" } -deno_timers = { version = "0.34.0", path = "../ext/timers" } deno_tls = { version = "0.23.0", path = "../ext/tls" } deno_url = { version = "0.36.0", path = "../ext/url" } deno_web = { version = "0.67.0", path = "../ext/web" } diff --git a/runtime/build.rs b/runtime/build.rs index e2fe21b9e..eea7a3602 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -93,7 +93,7 @@ mod not_docs { } } - impl deno_timers::TimersPermission for Permissions { + impl deno_web::TimersPermission for Permissions { fn allow_hrtime(&mut self) -> bool { unreachable!("snapshotting!") } @@ -145,13 +145,15 @@ mod not_docs { deno_console::init(), deno_url::init(), deno_tls::init(), - deno_web::init(deno_web::BlobStore::default(), Default::default()), + deno_web::init::<Permissions>( + deno_web::BlobStore::default(), + Default::default(), + ), deno_fetch::init::<Permissions>(Default::default()), deno_websocket::init::<Permissions>("".to_owned(), None, None), deno_webstorage::init(None), deno_crypto::init(None), deno_webgpu::init(false), - deno_timers::init::<Permissions>(), deno_broadcast_channel::init( deno_broadcast_channel::InMemoryBroadcastChannel::default(), false, // No --unstable. diff --git a/runtime/lib.rs b/runtime/lib.rs index fef3956ea..543d3a0a2 100644 --- a/runtime/lib.rs +++ b/runtime/lib.rs @@ -8,7 +8,6 @@ pub use deno_fetch; pub use deno_ffi; pub use deno_http; pub use deno_net; -pub use deno_timers; pub use deno_tls; pub use deno_url; pub use deno_web; diff --git a/runtime/permissions.rs b/runtime/permissions.rs index c404436d6..77ad8496f 100644 --- a/runtime/permissions.rs +++ b/runtime/permissions.rs @@ -1314,7 +1314,7 @@ impl deno_fetch::FetchPermissions for Permissions { } } -impl deno_timers::TimersPermission for Permissions { +impl deno_web::TimersPermission for Permissions { fn allow_hrtime(&mut self) -> bool { self.hrtime.check().is_ok() } diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 8cbbb5d4f..c90e91b92 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -368,7 +368,10 @@ impl WebWorker { deno_webidl::init(), deno_console::init(), deno_url::init(), - deno_web::init(options.blob_store.clone(), Some(main_module.clone())), + deno_web::init::<Permissions>( + options.blob_store.clone(), + Some(main_module.clone()), + ), deno_fetch::init::<Permissions>(deno_fetch::Options { user_agent: options.user_agent.clone(), root_cert_store: options.root_cert_store.clone(), @@ -386,7 +389,6 @@ impl WebWorker { deno_broadcast_channel::init(options.broadcast_channel.clone(), unstable), deno_crypto::init(options.seed), deno_webgpu::init(unstable), - deno_timers::init::<Permissions>(), // ffi deno_ffi::init::<Permissions>(unstable), // Permissions ext (worker specific state) diff --git a/runtime/worker.rs b/runtime/worker.rs index 1dc9504d6..1e31b84dc 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -100,7 +100,7 @@ impl MainWorker { deno_webidl::init(), deno_console::init(), deno_url::init(), - deno_web::init( + deno_web::init::<Permissions>( options.blob_store.clone(), options.bootstrap.location.clone(), ), @@ -122,7 +122,6 @@ impl MainWorker { deno_crypto::init(options.seed), deno_broadcast_channel::init(options.broadcast_channel.clone(), unstable), deno_webgpu::init(unstable), - deno_timers::init::<Permissions>(), // ffi deno_ffi::init::<Permissions>(unstable), // Runtime ops |