summaryrefslogtreecommitdiff
path: root/ext/node
diff options
context:
space:
mode:
author林炳权 <695601626@qq.com>2023-08-27 12:04:12 +0800
committerGitHub <noreply@github.com>2023-08-26 22:04:12 -0600
commit2080669943e79aba619bc80829172c696ec1f15c (patch)
tree9eb317754a9632220abb3df238a30375164d705a /ext/node
parente4cebf3e0da539321727b0f0e43ddce5679635b1 (diff)
chore: update to Rust 1.72 (#20258)
<!-- Before submitting a PR, please read https://deno.com/manual/contributing 1. Give the PR a descriptive title. Examples of good title: - fix(std/http): Fix race condition in server - docs(console): Update docstrings - feat(doc): Handle nested reexports Examples of bad title: - fix #7123 - update docs - fix bugs 2. Ensure there is a related issue and it is referenced in the PR text. 3. Ensure there are tests that cover the changes. 4. Ensure `cargo test` passes. 5. Ensure `./tools/format.js` passes without changing files. 6. Ensure `./tools/lint.js` passes. 7. Open as a draft PR if your work is still in progress. The CI won't run all steps, but you can add '[ci]' to a commit message to force it to. 8. If you would like to run the benchmarks on the CI, add the 'ci-bench' label. --> As the title. --------- Co-authored-by: Matt Mastracci <matthew@mastracci.com>
Diffstat (limited to 'ext/node')
-rw-r--r--ext/node/global.rs11
-rw-r--r--ext/node/ops/crypto/x509.rs46
-rw-r--r--ext/node/resolution.rs24
3 files changed, 43 insertions, 38 deletions
diff --git a/ext/node/global.rs b/ext/node/global.rs
index 52c1b6bb9..fd2f5a7cb 100644
--- a/ext/node/global.rs
+++ b/ext/node/global.rs
@@ -264,7 +264,9 @@ fn is_managed_key(
}
fn current_mode(scope: &mut v8::HandleScope) -> Mode {
- let Some(v8_string) = v8::StackTrace::current_script_name_or_source_url(scope) else {
+ let Some(v8_string) =
+ v8::StackTrace::current_script_name_or_source_url(scope)
+ else {
return Mode::Deno;
};
let op_state = deno_core::JsRuntime::op_state_from(scope);
@@ -375,7 +377,8 @@ pub fn query<'s>(
return;
};
- let Some(attributes) = inner.get_property_attributes(scope, key.into()) else {
+ let Some(attributes) = inner.get_property_attributes(scope, key.into())
+ else {
return;
};
@@ -429,7 +432,9 @@ pub fn enumerator<'s>(
};
let inner = v8::Local::new(scope, inner);
- let Some(array) = inner.get_property_names(scope, GetPropertyNamesArgs::default()) else {
+ let Some(array) =
+ inner.get_property_names(scope, GetPropertyNamesArgs::default())
+ else {
return;
};
diff --git a/ext/node/ops/crypto/x509.rs b/ext/node/ops/crypto/x509.rs
index 402c58b72..bef5fd2c8 100644
--- a/ext/node/ops/crypto/x509.rs
+++ b/ext/node/ops/crypto/x509.rs
@@ -230,31 +230,27 @@ fn x509name_to_string(
) -> Result<String, x509_parser::error::X509Error> {
// Lifted from https://github.com/rusticata/x509-parser/blob/4d618c2ed6b1fc102df16797545895f7c67ee0fe/src/x509.rs#L543-L566
// since it's a private function (Copyright 2017 Pierre Chifflier)
- name.iter_rdn().fold(Ok(String::new()), |acc, rdn| {
- acc.and_then(|mut _vec| {
- rdn
- .iter()
- .fold(Ok(String::new()), |acc2, attr| {
- acc2.and_then(|mut _vec2| {
- let val_str =
- attribute_value_to_string(attr.attr_value(), attr.attr_type())?;
- // look ABBREV, and if not found, use shortname
- let abbrev = match oid2abbrev(attr.attr_type(), oid_registry) {
- Ok(s) => String::from(s),
- _ => format!("{:?}", attr.attr_type()),
- };
- let rdn = format!("{}={}", abbrev, val_str);
- match _vec2.len() {
- 0 => Ok(rdn),
- _ => Ok(_vec2 + " + " + rdn.as_str()),
- }
- })
- })
- .map(|v| match _vec.len() {
- 0 => v,
- _ => _vec + "\n" + v.as_str(),
- })
- })
+ name.iter_rdn().try_fold(String::new(), |acc, rdn| {
+ rdn
+ .iter()
+ .try_fold(String::new(), |acc2, attr| {
+ let val_str =
+ attribute_value_to_string(attr.attr_value(), attr.attr_type())?;
+ // look ABBREV, and if not found, use shortname
+ let abbrev = match oid2abbrev(attr.attr_type(), oid_registry) {
+ Ok(s) => String::from(s),
+ _ => format!("{:?}", attr.attr_type()),
+ };
+ let rdn = format!("{}={}", abbrev, val_str);
+ match acc2.len() {
+ 0 => Ok(rdn),
+ _ => Ok(acc2 + " + " + rdn.as_str()),
+ }
+ })
+ .map(|v| match acc.len() {
+ 0 => v,
+ _ => acc + "\n" + v.as_str(),
+ })
})
}
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs
index 4272b8c86..7a88356d8 100644
--- a/ext/node/resolution.rs
+++ b/ext/node/resolution.rs
@@ -1053,9 +1053,10 @@ impl NodeResolver {
// ResolveSelf
let Some(package_config) =
- self.get_package_scope_config(referrer, permissions)? else {
- return Ok(None);
- };
+ self.get_package_scope_config(referrer, permissions)?
+ else {
+ return Ok(None);
+ };
if package_config.exists
&& package_config.name.as_ref() == Some(&package_name)
{
@@ -1132,9 +1133,10 @@ impl NodeResolver {
) -> Result<Option<PackageJson>, AnyError> {
let Some(root_folder) = self
.npm_resolver
- .resolve_package_folder_from_path(&referrer.to_file_path().unwrap())? else {
- return Ok(None);
- };
+ .resolve_package_folder_from_path(&referrer.to_file_path().unwrap())?
+ else {
+ return Ok(None);
+ };
let package_json_path = root_folder.join("package.json");
self
.load_package_json(permissions, package_json_path)
@@ -1146,7 +1148,8 @@ impl NodeResolver {
url: &ModuleSpecifier,
permissions: &dyn NodePermissions,
) -> Result<Option<PackageJson>, AnyError> {
- let Some(package_json_path) = self.get_closest_package_json_path(url)? else {
+ let Some(package_json_path) = self.get_closest_package_json_path(url)?
+ else {
return Ok(None);
};
self
@@ -1169,9 +1172,10 @@ impl NodeResolver {
}
let Some(root_pkg_folder) = self
.npm_resolver
- .resolve_package_folder_from_path(current_dir)? else {
- return Ok(None);
- };
+ .resolve_package_folder_from_path(current_dir)?
+ else {
+ return Ok(None);
+ };
while current_dir.starts_with(&root_pkg_folder) {
current_dir = current_dir.parent().unwrap();
let package_json_path = current_dir.join("package.json");