Skip to content

Commit c07d0d0

Browse files
committed
review
1 parent a35a3cc commit c07d0d0

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

cli/module_loader.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ use deno_graph::Module;
6363
use deno_graph::ModuleGraph;
6464
use deno_graph::Resolution;
6565
use deno_runtime::code_cache;
66-
use deno_runtime::deno_node::get_host_defined_options;
66+
use deno_runtime::deno_node::create_host_defined_options;
6767
use deno_runtime::deno_permissions::PermissionsContainer;
6868
use deno_semver::npm::NpmPackageReqReference;
6969
use node_resolver::NodeResolutionMode;
@@ -732,7 +732,7 @@ impl<TGraphContainer: ModuleGraphContainer> ModuleLoader
732732
) -> Option<deno_core::v8::Local<'s, deno_core::v8::Data>> {
733733
let name = deno_core::ModuleSpecifier::parse(name).ok()?;
734734
if self.0.shared.node_resolver.in_npm_package(&name) {
735-
Some(get_host_defined_options(scope))
735+
Some(create_host_defined_options(scope))
736736
} else {
737737
None
738738
}

cli/standalone/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use deno_core::ResolutionKind;
2525
use deno_npm::npm_rc::ResolvedNpmRc;
2626
use deno_package_json::PackageJsonDepValue;
2727
use deno_runtime::deno_fs;
28-
use deno_runtime::deno_node::get_host_defined_options;
28+
use deno_runtime::deno_node::create_host_defined_options;
2929
use deno_runtime::deno_node::NodeResolver;
3030
use deno_runtime::deno_permissions::Permissions;
3131
use deno_runtime::deno_permissions::PermissionsContainer;
@@ -275,7 +275,7 @@ impl ModuleLoader for EmbeddedModuleLoader {
275275
) -> Option<deno_core::v8::Local<'s, deno_core::v8::Data>> {
276276
let name = deno_core::ModuleSpecifier::parse(name).ok()?;
277277
if self.shared.node_resolver.in_npm_package(&name) {
278-
Some(get_host_defined_options(scope))
278+
Some(create_host_defined_options(scope))
279279
} else {
280280
None
281281
}

ext/node/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ impl<'a> deno_package_json::fs::DenoPkgJsonFs for DenoPkgJsonFsAdapter<'a> {
843843
}
844844
}
845845

846-
pub fn get_host_defined_options<'s>(
846+
pub fn create_host_defined_options<'s>(
847847
scope: &mut v8::HandleScope<'s>,
848848
) -> v8::Local<'s, v8::Data> {
849849
let host_defined_options = v8::PrimitiveArray::new(scope, 1);

ext/node/ops/vm_internal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
22

3-
use crate::get_host_defined_options;
3+
use crate::create_host_defined_options;
44
use deno_core::error::type_error;
55
use deno_core::error::AnyError;
66
use deno_core::v8;
@@ -21,7 +21,7 @@ impl ContextifyScript {
2121
source_str: v8::Local<v8::String>,
2222
) -> Result<Self, AnyError> {
2323
let resource_name = v8::undefined(scope);
24-
let host_defined_options = get_host_defined_options(scope);
24+
let host_defined_options = create_host_defined_options(scope);
2525
let origin = v8::ScriptOrigin::new(
2626
scope,
2727
resource_name.into(),

ext/node/polyfills/01_require.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ Module.prototype._compile = function (content, filename, format) {
10041004
const compiledWrapper = wrapSafe(filename, content, this, format);
10051005

10061006
if (format === "module") {
1007-
// TODO: implement require esm
1007+
// TODO(https://github.com/denoland/deno/issues/24822): implement require esm
10081008
throw createRequireEsmError(
10091009
filename,
10101010
moduleParentCache.get(module)?.filename,
@@ -1070,7 +1070,7 @@ Module._extensions[".js"] = function (module, filename) {
10701070
if (StringPrototypeEndsWith(filename, ".js")) {
10711071
const pkg = op_require_read_closest_package_json(filename);
10721072
if (pkg?.typ === "module") {
1073-
// TODO: implement require esm
1073+
// TODO(https://github.com/denoland/deno/issues/24822): implement require esm
10741074
format = "module";
10751075
throw createRequireEsmError(
10761076
filename,

ext/node_resolver/sync.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,9 @@ mod inner {
1515
#[cfg(not(feature = "sync"))]
1616
mod inner {
1717
pub use std::rc::Rc as MaybeArc;
18+
19+
pub trait MaybeSync {}
20+
impl<T> MaybeSync for T where T: ?Sized {}
21+
pub trait MaybeSend {}
22+
impl<T> MaybeSend for T where T: ?Sized {}
1823
}

0 commit comments

Comments
 (0)