summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorBartek Iwańczuk <biwanczuk@gmail.com>2023-06-26 13:54:10 +0200
committerGitHub <noreply@github.com>2023-06-26 13:54:10 +0200
commitad3c494b46c97f0cf91098b7ec2afa576ea7a3dd (patch)
tree2996e36708b4c726c3b5e99b6fbbd8e63fcc121b /ext
parentc7d38e593f7de66af47321e7463d8c15ae4176f2 (diff)
Revert "Reland "refactor(core): cleanup feature flags for js source i… (#19611)
…nclusion" (#19519)" This reverts commit 28a4f3d0f5383695b1d49ccdc8b0f799a715b2c2. This change causes failures when used outside Deno repo: ``` ============================================================ Deno has panicked. This is a bug in Deno. Please report this at https://github.com/denoland/deno/issues/new. If you can reliably reproduce this panic, include the reproduction steps and re-run with the RUST_BACKTRACE=1 env var set and include the backtrace in your report. Platform: linux x86_64 Version: 1.34.3+b37b286 Args: ["/opt/hostedtoolcache/deno/0.0.0-b37b286f7fa68d5656f7c180f6127bdc38cf2cf5/x64/deno", "test", "--doc", "--unstable", "--allow-all", "--coverage=./cov"] thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Failed to read "/home/runner/work/deno/deno/core/00_primordials.js" Caused by: No such file or directory (os error 2)', core/runtime/jsruntime.rs:699:8 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ```
Diffstat (limited to 'ext')
-rw-r--r--ext/fs/lib.rs1
-rw-r--r--ext/net/ops.rs2
-rw-r--r--ext/url/benches/url_ops.rs4
-rw-r--r--ext/web/benches/encoding.rs11
-rw-r--r--ext/web/benches/timers_ops.rs10
-rw-r--r--ext/webidl/benches/dict.rs2
6 files changed, 17 insertions, 13 deletions
diff --git a/ext/fs/lib.rs b/ext/fs/lib.rs
index d27712927..7ba6cd7ca 100644
--- a/ext/fs/lib.rs
+++ b/ext/fs/lib.rs
@@ -19,6 +19,7 @@ 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 d48d08823..921b9ea5b 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_ext()],
+ extensions: vec![test_ext::init_ops()],
..Default::default()
});
diff --git a/ext/url/benches/url_ops.rs b/ext/url/benches/url_ops.rs
index 2ead0429d..835dfea2e 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_ext(),
- deno_url::deno_url::init_ext(),
+ deno_webidl::deno_webidl::init_ops_and_esm(),
+ deno_url::deno_url::init_ops_and_esm(),
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 16278d26d..5b147f00c 100644
--- a/ext/web/benches/encoding.rs
+++ b/ext/web/benches/encoding.rs
@@ -24,10 +24,13 @@ impl deno_web::TimersPermission for Permissions {
fn setup() -> Vec<Extension> {
vec![
- 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),
+ 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,
+ ),
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 d5830efba..084fac98b 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_ext(),
- deno_url::deno_url::init_ext(),
- deno_console::deno_console::init_ext(),
- deno_web::deno_web::init_ext::<Permissions>(BlobStore::default(), None),
+ 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),
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 1b2fcd2e5..b3d95c8a3 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_ext(),
+ deno_webidl::deno_webidl::init_ops_and_esm(),
Extension::builder("deno_webidl_bench")
.esm(vec![ExtensionFileSource {
specifier: "ext:deno_webidl_bench/setup.js",