chore: Upgrade to 2025 edition

Author: epage

Cargo.toml

@@ -13,7 +13,7 @@ members = [
 [workspace.package]
 repository = "https://github.com/clap-rs/clap"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 rust-version = "1.85"  # MSRV
 include = [
   "build.rs",

clap_bench/benches/complex.rs

@@ -1,6 +1,6 @@
 #![allow(elided_lifetimes_in_paths)] // needed for divan
 
-use clap::{arg, ArgMatches, Command};
+use clap::{ArgMatches, Command, arg};
 
 macro_rules! create_app {
     () => {{

clap_bench/benches/empty.rs

@@ -4,9 +4,7 @@ use clap::ArgMatches;
 use clap::Command;
 
 macro_rules! create_app {
-    () => {{
-        Command::new("claptests")
-    }};
+    () => {{ Command::new("claptests") }};
 }
 
 #[divan::bench]

clap_bench/benches/ripgrep.rs

@@ -7,11 +7,11 @@
 
 use std::collections::HashMap;
 
-use clap::{value_parser, Arg, ArgAction, ArgMatches, Command};
+use clap::{Arg, ArgAction, ArgMatches, Command, value_parser};
 use lazy_static::lazy_static;
 
 mod build {
-    use super::{app_long, app_short, Command};
+    use super::{Command, app_long, app_short};
 
     #[divan::bench]
     fn short_help() -> Command {
@@ -41,7 +41,7 @@ mod render_help {
 }
 
 mod startup {
-    use super::{app_short, ArgMatches};
+    use super::{ArgMatches, app_short};
 
     #[divan::bench]
     fn simple() -> ArgMatches {

clap_bench/benches/rustup.rs

@@ -12,7 +12,7 @@ fn build() -> Command {
 }
 
 mod startup {
-    use super::{build_cli, ArgMatches};
+    use super::{ArgMatches, build_cli};
 
     #[divan::bench]
     fn empty() -> ArgMatches {

clap_bench/benches/simple.rs

@@ -1,6 +1,6 @@
 #![allow(elided_lifetimes_in_paths)] // needed for divan
 
-use clap::{arg, ArgMatches, Command};
+use clap::{ArgMatches, Command, arg};
 
 macro_rules! create_app {
     () => {{
@@ -20,7 +20,7 @@ fn build() -> Command {
 }
 
 mod startup {
-    use super::{arg, ArgMatches, Command};
+    use super::{ArgMatches, Command, arg};
 
     #[divan::bench]
     fn flag() -> ArgMatches {

clap_builder/src/builder/arg.rs

@@ -11,9 +11,10 @@ use std::{
 
 // Internal
 use super::{ArgFlags, ArgSettings};
-#[cfg(feature = "unstable-ext")]
-use crate::builder::ext::Extension;
-use crate::builder::ext::Extensions;
+use crate::ArgAction;
+use crate::INTERNAL_ERROR_MSG;
+use crate::Id;
+use crate::ValueHint;
 use crate::builder::ArgPredicate;
 use crate::builder::IntoResettable;
 use crate::builder::OsStr;
@@ -22,11 +23,10 @@ use crate::builder::Str;
 use crate::builder::StyledStr;
 use crate::builder::Styles;
 use crate::builder::ValueRange;
+#[cfg(feature = "unstable-ext")]
+use crate::builder::ext::Extension;
+use crate::builder::ext::Extensions;
 use crate::util::AnyValueId;
-use crate::ArgAction;
-use crate::Id;
-use crate::ValueHint;
-use crate::INTERNAL_ERROR_MSG;
 
 /// The abstract representation of a command line argument. Used to set all the options and
 /// relationships that define a valid argument for the program.
@@ -2065,8 +2065,9 @@ impl Arg {
     /// # use clap_builder as clap;
     /// # use std::env;
     /// # use clap::{Command, Arg, ArgAction};
-    ///
+    /// # unsafe {
     /// env::set_var("MY_FLAG", "env");
+    /// # }
     ///
     /// let m = Command::new("prog")
     ///     .arg(Arg::new("flag")
@@ -2094,8 +2095,10 @@ impl Arg {
     /// # use clap::{Command, Arg, ArgAction};
     /// # use clap::builder::FalseyValueParser;
     ///
+    /// # unsafe {
     /// env::set_var("TRUE_FLAG", "true");
     /// env::set_var("FALSE_FLAG", "0");
+    /// # }
     ///
     /// let m = Command::new("prog")
     ///     .arg(Arg::new("true_flag")
@@ -2129,7 +2132,9 @@ impl Arg {
     /// # use std::env;
     /// # use clap::{Command, Arg, ArgAction};
     ///
+    /// # unsafe {
     /// env::set_var("MY_FLAG", "env");
+    /// # }
     ///
     /// let m = Command::new("prog")
     ///     .arg(Arg::new("flag")
@@ -2151,7 +2156,9 @@ impl Arg {
     /// # use std::env;
     /// # use clap::{Command, Arg, ArgAction};
     ///
+    /// # unsafe {
     /// env::set_var("MY_FLAG", "env");
+    /// # }
     ///
     /// let m = Command::new("prog")
     ///     .arg(Arg::new("flag")
@@ -2173,7 +2180,9 @@ impl Arg {
     /// # use std::env;
     /// # use clap::{Command, Arg, ArgAction};
     ///
+    /// # unsafe {
     /// env::set_var("MY_FLAG_MULTI", "env1,env2");
+    /// # }
     ///
     /// let m = Command::new("prog")
     ///     .arg(Arg::new("flag")

clap_builder/src/builder/command.rs

@@ -9,25 +9,25 @@ use std::ops::Index;
 use std::path::Path;
 
 // Internal
-use crate::builder::app_settings::{AppFlags, AppSettings};
-use crate::builder::arg_settings::ArgSettings;
-use crate::builder::ext::Extension;
-use crate::builder::ext::Extensions;
 use crate::builder::ArgAction;
 use crate::builder::IntoResettable;
 use crate::builder::PossibleValue;
 use crate::builder::Str;
 use crate::builder::StyledStr;
 use crate::builder::Styles;
+use crate::builder::app_settings::{AppFlags, AppSettings};
+use crate::builder::arg_settings::ArgSettings;
+use crate::builder::ext::Extension;
+use crate::builder::ext::Extensions;
 use crate::builder::{Arg, ArgGroup, ArgPredicate};
 use crate::error::ErrorKind;
 use crate::error::Result as ClapResult;
 use crate::mkeymap::MKeyMap;
 use crate::output::fmt::Stream;
-use crate::output::{fmt::Colorizer, write_help, Usage};
+use crate::output::{Usage, fmt::Colorizer, write_help};
 use crate::parser::{ArgMatcher, ArgMatches, Parser};
 use crate::util::ChildGraph;
-use crate::util::{color::ColorChoice, Id};
+use crate::util::{Id, color::ColorChoice};
 use crate::{Error, INTERNAL_ERROR_MSG};
 
 #[cfg(debug_assertions)]
@@ -876,9 +876,13 @@ impl Command {
                     let command = command.to_owned();
                     debug!("Command::try_get_matches_from_mut: Parsed command {command} from argv");
 
-                    debug!("Command::try_get_matches_from_mut: Reinserting command into arguments so subcommand parser matches it");
+                    debug!(
+                        "Command::try_get_matches_from_mut: Reinserting command into arguments so subcommand parser matches it"
+                    );
                     raw_args.insert(&cursor, [&command]);
-                    debug!("Command::try_get_matches_from_mut: Clearing name and bin_name so that displayed command name starts with applet name");
+                    debug!(
+                        "Command::try_get_matches_from_mut: Clearing name and bin_name so that displayed command name starts with applet name"
+                    );
                     self.name = "".into();
                     self.bin_name = None;
                     return self._do_parse(&mut raw_args, cursor);
@@ -4042,7 +4046,9 @@ impl Command {
                             .map(|id| self.find(id).expect(INTERNAL_ERROR_MSG)),
                     );
                 } else {
-                    panic!("Command::get_arg_conflicts_with: The passed arg conflicts with an arg unknown to the cmd");
+                    panic!(
+                        "Command::get_arg_conflicts_with: The passed arg conflicts with an arg unknown to the cmd"
+                    );
                 }
             }
             result
@@ -4696,11 +4702,12 @@ impl Command {
                 .map(|arg| arg.get_id().clone())
                 .collect();
 
-            debug_assert!(args_missing_help.is_empty(),
-                    "Command::help_expected is enabled for the Command {}, but at least one of its arguments does not have either `help` or `long_help` set. List of such arguments: {}",
-                    self.name,
-                    args_missing_help.join(", ")
-                );
+            debug_assert!(
+                args_missing_help.is_empty(),
+                "Command::help_expected is enabled for the Command {}, but at least one of its arguments does not have either `help` or `long_help` set. List of such arguments: {}",
+                self.name,
+                args_missing_help.join(", ")
+            );
         }
 
         for sub_app in &self.subcommands {