summaryrefslogtreecommitdiff
path: root/ext/node
diff options
context:
space:
mode:
Diffstat (limited to 'ext/node')
-rw-r--r--ext/node/errors.rs47
-rw-r--r--ext/node/lib.rs6
-rw-r--r--ext/node/resolution.rs8
3 files changed, 26 insertions, 35 deletions
diff --git a/ext/node/errors.rs b/ext/node/errors.rs
index 9158ab0c5..bad6696ba 100644
--- a/ext/node/errors.rs
+++ b/ext/node/errors.rs
@@ -13,12 +13,11 @@ pub fn err_invalid_module_specifier(
maybe_base: Option<String>,
) -> AnyError {
let mut msg = format!(
- "[ERR_INVALID_MODULE_SPECIFIER] Invalid module \"{}\" {}",
- request, reason
+ "[ERR_INVALID_MODULE_SPECIFIER] Invalid module \"{request}\" {reason}"
);
if let Some(base) = maybe_base {
- msg = format!("{} imported from {}", msg, base);
+ msg = format!("{msg} imported from {base}");
}
type_error(msg)
@@ -30,17 +29,15 @@ pub fn err_invalid_package_config(
maybe_base: Option<String>,
maybe_message: Option<String>,
) -> AnyError {
- let mut msg = format!(
- "[ERR_INVALID_PACKAGE_CONFIG] Invalid package config {}",
- path
- );
+ let mut msg =
+ format!("[ERR_INVALID_PACKAGE_CONFIG] Invalid package config {path}");
if let Some(base) = maybe_base {
- msg = format!("{} while importing {}", msg, base);
+ msg = format!("{msg} while importing {base}");
}
if let Some(message) = maybe_message {
- msg = format!("{}. {}", msg, message);
+ msg = format!("{msg}. {message}");
}
generic_error(msg)
@@ -49,8 +46,7 @@ pub fn err_invalid_package_config(
#[allow(unused)]
pub fn err_module_not_found(path: &str, base: &str, typ: &str) -> AnyError {
generic_error(format!(
- "[ERR_MODULE_NOT_FOUND] Cannot find {} \"{}\" imported from \"{}\"",
- typ, path, base
+ "[ERR_MODULE_NOT_FOUND] Cannot find {typ} \"{path}\" imported from \"{base}\""
))
}
@@ -86,10 +82,10 @@ pub fn err_invalid_package_target(
};
if let Some(base) = maybe_referrer {
- msg = format!("{} imported from {}", msg, base);
+ msg = format!("{msg} imported from {base}");
};
if rel_error {
- msg = format!("{}; target must start with \"./\"", msg);
+ msg = format!("{msg}; target must start with \"./\"");
}
generic_error(msg)
@@ -116,16 +112,14 @@ pub fn err_package_path_not_exported(
}
if subpath == "." {
- msg = format!(
- "{} No \"exports\" main defined in '{}package.json'",
- msg, pkg_path
- );
+ msg =
+ format!("{msg} No \"exports\" main defined in '{pkg_path}package.json'");
} else {
- msg = format!("{} Package subpath '{}' is not defined by \"exports\" in '{}package.json'", msg, subpath, pkg_path);
+ msg = format!("{msg} Package subpath '{subpath}' is not defined by \"exports\" in '{pkg_path}package.json'");
};
if let Some(referrer) = maybe_referrer {
- msg = format!("{} imported from '{}'", msg, referrer);
+ msg = format!("{msg} imported from '{referrer}'");
}
generic_error(msg)
@@ -137,21 +131,20 @@ pub fn err_package_import_not_defined(
base: &str,
) -> AnyError {
let mut msg = format!(
- "[ERR_PACKAGE_IMPORT_NOT_DEFINED] Package import specifier \"{}\" is not defined in",
- specifier
+ "[ERR_PACKAGE_IMPORT_NOT_DEFINED] Package import specifier \"{specifier}\" is not defined in"
);
if let Some(package_path) = package_path {
- msg = format!("{} in package {}package.json", msg, package_path);
+ msg = format!("{msg} in package {package_path}package.json");
}
- msg = format!("{} imported from {}", msg, base);
+ msg = format!("{msg} imported from {base}");
type_error(msg)
}
pub fn err_unsupported_dir_import(path: &str, base: &str) -> AnyError {
- generic_error(format!("[ERR_UNSUPPORTED_DIR_IMPORT] Directory import '{}' is not supported resolving ES modules imported from {}", path, base))
+ generic_error(format!("[ERR_UNSUPPORTED_DIR_IMPORT] Directory import '{path}' is not supported resolving ES modules imported from {base}"))
}
pub fn err_unsupported_esm_url_scheme(url: &Url) -> AnyError {
@@ -160,10 +153,8 @@ pub fn err_unsupported_esm_url_scheme(url: &Url) -> AnyError {
.to_string();
if cfg!(window) && url.scheme().len() == 2 {
- msg = format!(
- "{}. On Windows, absolute path must be valid file:// URLs",
- msg
- );
+ msg =
+ format!("{msg}. On Windows, absolute path must be valid file:// URLs");
}
msg = format!("{}. Received protocol '{}'", msg, url.scheme());
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
index 3eda18958..3c0e32308 100644
--- a/ext/node/lib.rs
+++ b/ext/node/lib.rs
@@ -69,7 +69,7 @@ pub static NODE_GLOBAL_THIS_NAME: Lazy<String> = Lazy::new(|| {
.unwrap()
.as_secs();
// use a changing variable name to make it hard to depend on this
- format!("__DENO_NODE_GLOBAL_THIS_{}__", seconds)
+ format!("__DENO_NODE_GLOBAL_THIS_{seconds}__")
});
pub static NODE_ENV_VAR_ALLOWLIST: Lazy<HashSet<String>> = Lazy::new(|| {
@@ -497,7 +497,7 @@ where
if request == pkg_name {
// pass
- } else if request.starts_with(&format!("{}/", pkg_name)) {
+ } else if request.starts_with(&format!("{pkg_name}/")) {
expansion += &request[pkg_name.len()..];
} else {
return Ok(None);
@@ -579,7 +579,7 @@ where
let referrer = Url::from_file_path(parent_path).unwrap();
resolution::package_exports_resolve(
&pkg.path,
- format!(".{}", expansion),
+ format!(".{expansion}"),
exports,
&referrer,
NodeModuleKind::Cjs,
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs
index 81a2521b5..ccd272741 100644
--- a/ext/node/resolution.rs
+++ b/ext/node/resolution.rs
@@ -117,7 +117,7 @@ pub fn with_known_extension(path: &Path, ext: &str) -> PathBuf {
Some(period_index) => &file_name[..period_index],
None => &file_name,
};
- path.with_file_name(format!("{}.{}", file_name, ext))
+ path.with_file_name(format!("{file_name}.{ext}"))
}
fn to_specifier_display_string(url: &ModuleSpecifier) -> String {
@@ -350,7 +350,7 @@ fn resolve_package_target_string(
.replace(&target, |_caps: &regex::Captures| subpath.clone())
.to_string()
} else {
- format!("{}{}", target, subpath)
+ format!("{target}{subpath}")
};
let package_json_url =
ModuleSpecifier::from_file_path(package_json_path).unwrap();
@@ -404,7 +404,7 @@ fn resolve_package_target_string(
let request = if pattern {
match_.replace('*', &subpath)
} else {
- format!("{}{}", match_, subpath)
+ format!("{match_}{subpath}")
};
return Err(throw_invalid_subpath(
request,
@@ -915,7 +915,7 @@ pub fn legacy_main_resolve(
.path
.parent()
.unwrap()
- .join(format!("{}{}", main, ending))
+ .join(format!("{main}{ending}"))
.clean();
if file_exists(&guess) {
// TODO(bartlomieju): emitLegacyIndexDeprecation()
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 20:46:30 +0000