From 2080669943e79aba619bc80829172c696ec1f15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=82=B3=E6=9D=83?= <695601626@qq.com>
Date: Sun, 27 Aug 2023 12:04:12 +0800
Subject: 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>
---
 ext/node/ops/crypto/x509.rs | 46 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'ext/node/ops')

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(),
+      })
   })
 }
 
-- 
cgit v1.2.3