chore: Bump MSRV to 1.85

Author: epage

.github/workflows/ci.yml

@@ -122,7 +122,7 @@ jobs:
         build: [msrv, wasm, wasm-wasi, debug, release]
         include:
           - build: msrv
-            rust: "1.74"  # MSRV
+            rust: "1.85"  # MSRV
             target: x86_64-unknown-linux-gnu
             features: full
           - build: wasm

Cargo.toml

@@ -14,7 +14,7 @@ members = [
 repository = "https://github.com/clap-rs/clap"
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.74"  # MSRV
+rust-version = "1.85"  # MSRV
 include = [
   "build.rs",
   "src/**/*",

clap_builder/src/parser/parser.rs

@@ -54,14 +54,15 @@ impl<'cmd> Parser<'cmd> {
     ) -> ClapResult<()> {
         debug!("Parser::get_matches_with");
 
-        ok!(self.parse(matcher, raw_args, args_cursor).map_err(|err| {
-            if self.cmd.is_ignore_errors_set() {
-                #[cfg(feature = "env")]
-                let _ = self.add_env(matcher);
-                let _ = self.add_defaults(matcher);
-            }
-            err
-        }));
+        ok!(self
+            .parse(matcher, raw_args, args_cursor)
+            .inspect_err(|_err| {
+                if self.cmd.is_ignore_errors_set() {
+                    #[cfg(feature = "env")]
+                    let _ = self.add_env(matcher);
+                    let _ = self.add_defaults(matcher);
+                }
+            }));
         ok!(self.resolve_pending(matcher));
 
         #[cfg(feature = "env")]