From 161a4fea47d134fa6077910b794883ffb6e9b0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Wed, 8 Feb 2023 00:21:43 +0100 Subject: refactor(core): change SourcePair to ExtensionFileSource (#17686) --- ext/url/benches/url_ops.rs | 9 +++++---- ext/web/benches/encoding.rs | 9 +++++---- ext/web/benches/timers_ops.rs | 8 ++++++-- ext/webidl/benches/dict.rs | 6 +++++- 4 files changed, 21 insertions(+), 11 deletions(-) (limited to 'ext') diff --git a/ext/url/benches/url_ops.rs b/ext/url/benches/url_ops.rs index fd8cac7ef..001b5de92 100644 --- a/ext/url/benches/url_ops.rs +++ b/ext/url/benches/url_ops.rs @@ -6,18 +6,19 @@ use deno_bench_util::bencher::benchmark_group; use deno_bench_util::bencher::Bencher; use deno_core::Extension; +use deno_core::ExtensionFileSource; fn setup() -> Vec { vec![ deno_webidl::init(), deno_url::init(), Extension::builder("bench_setup") - .esm(vec![( - "internal:setup", - r#"import { URL } from "internal:deno_url/00_url.js"; + .esm(vec![ExtensionFileSource { + specifier: "internal:setup".to_string(), + code: r#"import { URL } from "internal:deno_url/00_url.js"; globalThis.URL = URL; "#, - )]) + }]) .build(), ] } diff --git a/ext/web/benches/encoding.rs b/ext/web/benches/encoding.rs index a96da1bc6..bb297a1bf 100644 --- a/ext/web/benches/encoding.rs +++ b/ext/web/benches/encoding.rs @@ -5,6 +5,7 @@ use deno_bench_util::bench_or_profile; use deno_bench_util::bencher::benchmark_group; use deno_bench_util::bencher::Bencher; use deno_core::Extension; +use deno_core::ExtensionFileSource; use deno_web::BlobStore; struct Permissions; @@ -29,14 +30,14 @@ fn setup() -> Vec { deno_console::init(), deno_web::init::(BlobStore::default(), None), Extension::builder("bench_setup") - .esm(vec![( - "internal:setup", - r#" + .esm(vec![ExtensionFileSource { + specifier: "internal:setup".to_string(), + code: r#" import { TextDecoder } from "internal:deno_web/08_text_encoding.js"; globalThis.TextDecoder = TextDecoder; globalThis.hello12k = Deno.core.encode("hello world\n".repeat(1e3)); "#, - )]) + }]) .state(|state| { state.put(Permissions {}); Ok(()) diff --git a/ext/web/benches/timers_ops.rs b/ext/web/benches/timers_ops.rs index 943c73bbc..f01b4c532 100644 --- a/ext/web/benches/timers_ops.rs +++ b/ext/web/benches/timers_ops.rs @@ -5,6 +5,7 @@ use deno_bench_util::bench_or_profile; use deno_bench_util::bencher::benchmark_group; use deno_bench_util::bencher::Bencher; use deno_core::Extension; +use deno_core::ExtensionFileSource; use deno_web::BlobStore; struct Permissions; @@ -29,11 +30,14 @@ fn setup() -> Vec { deno_web::init::(BlobStore::default(), None), Extension::builder("bench_setup") .esm(vec![ - ("internal:setup", r#" + ExtensionFileSource { + specifier: "internal:setup".to_string(), + code: r#" import { setTimeout, handleTimerMacrotask } from "internal:deno_web/02_timers.js"; globalThis.setTimeout = setTimeout; Deno.core.setMacrotaskCallback(handleTimerMacrotask); - "#), + "# + }, ]) .state(|state| { state.put(Permissions{}); diff --git a/ext/webidl/benches/dict.rs b/ext/webidl/benches/dict.rs index 1400a00ed..00bef4935 100644 --- a/ext/webidl/benches/dict.rs +++ b/ext/webidl/benches/dict.rs @@ -6,12 +6,16 @@ use deno_bench_util::bencher::benchmark_group; use deno_bench_util::bencher::Bencher; use deno_core::Extension; +use deno_core::ExtensionFileSource; fn setup() -> Vec { vec![ deno_webidl::init(), Extension::builder("deno_webidl_bench") - .esm(vec![("internal:setup", include_str!("dict.js"))]) + .esm(vec![ExtensionFileSource { + specifier: "internal:setup".to_string(), + code: include_str!("dict.js"), + }]) .build(), ] } -- cgit v1.2.3