diff options
author | Nayeem Rahman <nayeemrmn99@gmail.com> | 2023-06-25 08:35:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-25 09:35:31 +0200 |
commit | 28a4f3d0f5383695b1d49ccdc8b0f799a715b2c2 (patch) | |
tree | cd75b05db0bbfdadf3e565ca120d1f5d9ca39942 /ext | |
parent | a181ceb0e3791c842db6e8e6f528cf9ce320642a (diff) |
Reland "refactor(core): cleanup feature flags for js source inclusion" (#19519)
Relands #19463. This time the `ExtensionFileSourceCode` enum is
preserved, so this effectively just splits feature
`include_js_for_snapshotting` into `exclude_js_sources` and
`runtime_js_sources`, adds a `force_include_js_sources` option on
`extension!()`, and unifies `ext::Init_ops_and_esm()` and
`ext::init_ops()` into `ext::init()`.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/fs/lib.rs | 1 | ||||
-rw-r--r-- | ext/net/ops.rs | 2 | ||||
-rw-r--r-- | ext/url/benches/url_ops.rs | 4 | ||||
-rw-r--r-- | ext/web/benches/encoding.rs | 11 | ||||
-rw-r--r-- | ext/web/benches/timers_ops.rs | 10 | ||||
-rw-r--r-- | ext/webidl/benches/dict.rs | 2 |
6 files changed, 13 insertions, 17 deletions
diff --git a/ext/fs/lib.rs b/ext/fs/lib.rs index 7ba6cd7ca..d27712927 100644 --- a/ext/fs/lib.rs +++ b/ext/fs/lib.rs @@ -19,7 +19,6 @@ use crate::ops::*; use deno_core::error::AnyError; use deno_core::OpState; use std::cell::RefCell; -use std::convert::From; use std::path::Path; use std::rc::Rc; diff --git a/ext/net/ops.rs b/ext/net/ops.rs index 921b9ea5b..d48d08823 100644 --- a/ext/net/ops.rs +++ b/ext/net/ops.rs @@ -1034,7 +1034,7 @@ mod tests { ); let mut runtime = JsRuntime::new(RuntimeOptions { - extensions: vec![test_ext::init_ops()], + extensions: vec![test_ext::init_ext()], ..Default::default() }); diff --git a/ext/url/benches/url_ops.rs b/ext/url/benches/url_ops.rs index 835dfea2e..2ead0429d 100644 --- a/ext/url/benches/url_ops.rs +++ b/ext/url/benches/url_ops.rs @@ -11,8 +11,8 @@ use deno_core::ExtensionFileSourceCode; fn setup() -> Vec<Extension> { vec![ - deno_webidl::deno_webidl::init_ops_and_esm(), - deno_url::deno_url::init_ops_and_esm(), + deno_webidl::deno_webidl::init_ext(), + deno_url::deno_url::init_ext(), Extension::builder("bench_setup") .esm(vec![ExtensionFileSource { specifier: "ext:bench_setup/setup", diff --git a/ext/web/benches/encoding.rs b/ext/web/benches/encoding.rs index 5b147f00c..16278d26d 100644 --- a/ext/web/benches/encoding.rs +++ b/ext/web/benches/encoding.rs @@ -24,13 +24,10 @@ impl deno_web::TimersPermission for Permissions { fn setup() -> Vec<Extension> { vec![ - deno_webidl::deno_webidl::init_ops_and_esm(), - deno_url::deno_url::init_ops_and_esm(), - deno_console::deno_console::init_ops_and_esm(), - deno_web::deno_web::init_ops_and_esm::<Permissions>( - BlobStore::default(), - None, - ), + deno_webidl::deno_webidl::init_ext(), + deno_url::deno_url::init_ext(), + deno_console::deno_console::init_ext(), + deno_web::deno_web::init_ext::<Permissions>(BlobStore::default(), None), Extension::builder("bench_setup") .esm(vec![ExtensionFileSource { specifier: "ext:bench_setup/setup", diff --git a/ext/web/benches/timers_ops.rs b/ext/web/benches/timers_ops.rs index 084fac98b..d5830efba 100644 --- a/ext/web/benches/timers_ops.rs +++ b/ext/web/benches/timers_ops.rs @@ -22,14 +22,14 @@ impl deno_web::TimersPermission for Permissions { fn setup() -> Vec<Extension> { vec![ - deno_webidl::deno_webidl::init_ops_and_esm(), - deno_url::deno_url::init_ops_and_esm(), - deno_console::deno_console::init_ops_and_esm(), - deno_web::deno_web::init_ops_and_esm::<Permissions>(BlobStore::default(), None), + deno_webidl::deno_webidl::init_ext(), + deno_url::deno_url::init_ext(), + deno_console::deno_console::init_ext(), + deno_web::deno_web::init_ext::<Permissions>(BlobStore::default(), None), Extension::builder("bench_setup") .esm(vec![ ExtensionFileSource { - specifier: "ext:bench_setup/setup", + specifier: "ext:bench_setup/setup", code: ExtensionFileSourceCode::IncludedInBinary(r#" import { setTimeout, handleTimerMacrotask } from "ext:deno_web/02_timers.js"; globalThis.setTimeout = setTimeout; diff --git a/ext/webidl/benches/dict.rs b/ext/webidl/benches/dict.rs index b3d95c8a3..1b2fcd2e5 100644 --- a/ext/webidl/benches/dict.rs +++ b/ext/webidl/benches/dict.rs @@ -11,7 +11,7 @@ use deno_core::ExtensionFileSourceCode; fn setup() -> Vec<Extension> { vec![ - deno_webidl::deno_webidl::init_ops_and_esm(), + deno_webidl::deno_webidl::init_ext(), Extension::builder("deno_webidl_bench") .esm(vec![ExtensionFileSource { specifier: "ext:deno_webidl_bench/setup.js", |