summaryrefslogtreecommitdiff
path: root/ext/node/ops
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/ops
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/ops')
-rw-r--r--ext/node/ops/crypto/x509.rs46
1 files changed, 21 insertions, 25 deletions
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(),
+ })
})
}