refactor: Migrate to Edition 2024

Cargo.toml

@@ -4,8 +4,8 @@ resolver = "2"
 [workspace.package]
 repository = "https://github.com/crate-ci/cargo-release"
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.82"  # MSRV
+edition = "2024"
+rust-version = "1.85"  # MSRV
 include = [
   "build.rs",
   "src/**/*",

src/config.rs

@@ -380,8 +380,8 @@ pub enum Command {
 impl Command {
     pub fn args(&self) -> Vec<&str> {
         match self {
-            Command::Line(ref s) => vec![s.as_str()],
-            Command::Args(ref a) => a.iter().map(|s| s.as_str()).collect(),
+            Command::Line(s) => vec![s.as_str()],
+            Command::Args(a) => a.iter().map(|s| s.as_str()).collect(),
         }
     }
 }

src/ops/cargo.rs

@@ -389,9 +389,7 @@ fn upgrade_req(
         log::debug!("unsupported dependency {}", name);
         return false;
     };
-    let existing_req = if let Ok(existing_req) = semver::VersionReq::parse(existing_req_str) {
-        existing_req
-    } else {
+    let Ok(existing_req) = semver::VersionReq::parse(existing_req_str) else {
         log::debug!("unsupported dependency req {}={}", name, existing_req_str);
         return false;
     };
@@ -461,11 +459,7 @@ pub fn sort_workspace(ws_meta: &cargo_metadata::Metadata) -> Vec<&cargo_metadata
                         .iter()
                         .all(|info| info.kind == cargo_metadata::DependencyKind::Development);
 
-                    if dev_only {
-                        None
-                    } else {
-                        Some(&dep.pkg)
-                    }
+                    if dev_only { None } else { Some(&dep.pkg) }
                 });
 
                 Some((&n.id, non_dev_pkgs.collect()))

src/ops/shell.rs

@@ -1,4 +1,4 @@
-use std::io::{stdin, stdout, Write};
+use std::io::{Write, stdin, stdout};
 
 use anyhow::Context as _;
 use clap::builder::styling::Style;

src/steps/changes.rs

@@ -252,17 +252,21 @@ pub fn changes(
                         CommitStatus::Ignore => None,
                     };
                     if let Some(suggested) = suggested {
-                        let _ = crate::ops::shell::note(format!("to update the version, run `cargo release version -p {crate_name} {suggested}`"));
+                        let _ = crate::ops::shell::note(format!(
+                            "to update the version, run `cargo release version -p {crate_name} {suggested}`"
+                        ));
                     } else if unbumped {
-                        let _ = crate::ops::shell::note(format!("to update the version, run `cargo release version -p {crate_name} <LEVEL|VERSION>`"));
+                        let _ = crate::ops::shell::note(format!(
+                            "to update the version, run `cargo release version -p {crate_name} <LEVEL|VERSION>`"
+                        ));
                     }
                 }
             }
         } else {
             log::debug!(
-                    "Cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name <TAG>`.",
-                    crate_name,
-                );
+                "Cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name <TAG>`.",
+                crate_name,
+            );
         }
     }
 

src/steps/commit.rs

@@ -1,7 +1,7 @@
 use crate::config;
 use crate::error::CliError;
 use crate::ops::git;
-use crate::ops::replace::{Template, NOW};
+use crate::ops::replace::{NOW, Template};
 use crate::steps::plan;
 
 /// Commit the specified packages

src/steps/config.rs

@@ -1,9 +1,9 @@
 use std::io::Write;
 
-use crate::config::load_package_config;
-use crate::config::load_workspace_config;
 use crate::config::Config;
 use crate::config::ConfigArgs;
+use crate::config::load_package_config;
+use crate::config::load_workspace_config;
 use crate::error::CliError;
 
 /// Dump workspace configuration

src/steps/hook.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use crate::error::CliError;
 use crate::ops::cmd;
 use crate::ops::git;
-use crate::ops::replace::{Template, NOW};
+use crate::ops::replace::{NOW, Template};
 use crate::steps::plan;
 
 /// Run pre-release hooks
@@ -70,9 +70,7 @@ impl HookStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/mod.rs

@@ -373,16 +373,16 @@ pub fn warn_changed(
                 }
             } else {
                 log::debug!(
-                        "cannot detect changes for {} because tag {} is missing. Try setting `--prev-tag-name <TAG>`.",
-                        crate_name,
-                        prior_tag_name
-                    );
+                    "cannot detect changes for {} because tag {} is missing. Try setting `--prev-tag-name <TAG>`.",
+                    crate_name,
+                    prior_tag_name
+                );
             }
         } else {
             log::debug!(
-                    "cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name <TAG>`.",
-                    crate_name,
-                );
+                "cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name <TAG>`.",
+                crate_name,
+            );
         }
     }
 

src/steps/owner.rs

@@ -60,9 +60,7 @@ impl OwnerStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/publish.rs

@@ -67,9 +67,7 @@ impl PublishStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/push.rs

@@ -68,9 +68,7 @@ impl PushStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/release.rs

@@ -85,9 +85,7 @@ impl ReleaseStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in &excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };
@@ -154,9 +152,7 @@ impl ReleaseStep {
         let pkgs = plan::plan(pkgs)?;
 
         for excluded_pkg in &excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/replace.rs

@@ -1,6 +1,6 @@
 use crate::error::CliError;
 use crate::ops::git;
-use crate::ops::replace::{do_file_replacements, Template, NOW};
+use crate::ops::replace::{NOW, Template, do_file_replacements};
 use crate::steps::plan;
 
 /// Perform pre-release replacements
@@ -66,9 +66,7 @@ impl ReplaceStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/tag.rs

@@ -2,8 +2,8 @@ use std::collections::HashSet;
 
 use crate::error::CliError;
 use crate::ops::git;
-use crate::ops::replace::Template;
 use crate::ops::replace::NOW;
+use crate::ops::replace::Template;
 use crate::steps::plan;
 
 /// Tag the released commits
@@ -69,9 +69,7 @@ impl TagStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

src/steps/version.rs

@@ -84,9 +84,7 @@ impl VersionStep {
 
         let (_selected_pkgs, excluded_pkgs) = self.workspace.partition_packages(&ws_meta);
         for excluded_pkg in excluded_pkgs {
-            let pkg = if let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) {
-                pkg
-            } else {
+            let Some(pkg) = pkgs.get_mut(&excluded_pkg.id) else {
                 // Either not in workspace or marked as `release = false`.
                 continue;
             };

tests/testsuite/version/downgrade_error/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/dry_run/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/ignore_dependent/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/set_absolute_version/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/set_absolute_workspace_version/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/set_relative_version/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/set_relative_workspace_version/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/upgrade_compatible_dependency/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/upgrade_incompatible_dependency/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/upgrade_workspace/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/virtual_workspace_deps/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/workspace_deps/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {

tests/testsuite/version/workspace_version_exclude/mod.rs

@@ -3,9 +3,9 @@ use cargo_test_support::compare::assert_ui;
 use cargo_test_support::current_dir;
 use cargo_test_support::file;
 
+use crate::CargoCommand;
 use crate::git_from;
 use crate::init_registry;
-use crate::CargoCommand;
 
 #[cargo_test]
 fn case() {