From 0833451e84a5583358f864c714d4dd63c13e9017 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 20 Feb 2025 11:54:46 -0600 Subject: [PATCH] refactor: Migrate to Edition 2024 --- Cargo.toml | 2 +- src/config.rs | 4 ++-- src/ops/cargo.rs | 10 ++-------- src/ops/shell.rs | 2 +- src/steps/changes.rs | 14 +++++++++----- src/steps/commit.rs | 2 +- src/steps/config.rs | 4 ++-- src/steps/hook.rs | 6 ++---- src/steps/mod.rs | 14 +++++++------- src/steps/owner.rs | 4 +--- src/steps/publish.rs | 4 +--- src/steps/push.rs | 4 +--- src/steps/release.rs | 8 ++------ src/steps/replace.rs | 6 ++---- src/steps/tag.rs | 6 ++---- src/steps/version.rs | 4 +--- tests/testsuite/version/downgrade_error/mod.rs | 2 +- tests/testsuite/version/dry_run/mod.rs | 2 +- tests/testsuite/version/ignore_dependent/mod.rs | 2 +- .../testsuite/version/set_absolute_version/mod.rs | 2 +- .../version/set_absolute_workspace_version/mod.rs | 2 +- .../testsuite/version/set_relative_version/mod.rs | 2 +- .../version/set_relative_workspace_version/mod.rs | 2 +- .../version/upgrade_compatible_dependency/mod.rs | 2 +- .../version/upgrade_incompatible_dependency/mod.rs | 2 +- tests/testsuite/version/upgrade_workspace/mod.rs | 2 +- .../version/virtual_workspace_deps/mod.rs | 2 +- tests/testsuite/version/workspace_deps/mod.rs | 2 +- .../version/workspace_version_exclude/mod.rs | 2 +- .../version/workspace_version_subset/mod.rs | 2 +- 30 files changed, 51 insertions(+), 71 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 72616099f..4400fe1e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" [workspace.package] repository = "https://github.com/crate-ci/cargo-release" license = "MIT OR Apache-2.0" -edition = "2021" +edition = "2024" rust-version = "1.85" # MSRV include = [ "build.rs", diff --git a/src/config.rs b/src/config.rs index cac599ee7..9714fab39 100644 --- a/src/config.rs +++ b/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(), } } } diff --git a/src/ops/cargo.rs b/src/ops/cargo.rs index 395b36f57..e30544695 100644 --- a/src/ops/cargo.rs +++ b/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())) diff --git a/src/ops/shell.rs b/src/ops/shell.rs index 6357fb9b8..650eac1f5 100644 --- a/src/ops/shell.rs +++ b/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; diff --git a/src/steps/changes.rs b/src/steps/changes.rs index dd9acf911..ee09d2610 100644 --- a/src/steps/changes.rs +++ b/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} `")); + let _ = crate::ops::shell::note(format!( + "to update the version, run `cargo release version -p {crate_name} `" + )); } } } } else { log::debug!( - "Cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name `.", - crate_name, - ); + "Cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name `.", + crate_name, + ); } } diff --git a/src/steps/commit.rs b/src/steps/commit.rs index 05eff5e9f..4b2615773 100644 --- a/src/steps/commit.rs +++ b/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 diff --git a/src/steps/config.rs b/src/steps/config.rs index 71469cbaf..b4c7391ed 100644 --- a/src/steps/config.rs +++ b/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 diff --git a/src/steps/hook.rs b/src/steps/hook.rs index 6c629e1ec..b90513d1d 100644 --- a/src/steps/hook.rs +++ b/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; }; diff --git a/src/steps/mod.rs b/src/steps/mod.rs index 89b736e8f..e5eada557 100644 --- a/src/steps/mod.rs +++ b/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 `.", - crate_name, - prior_tag_name - ); + "cannot detect changes for {} because tag {} is missing. Try setting `--prev-tag-name `.", + crate_name, + prior_tag_name + ); } } else { log::debug!( - "cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name `.", - crate_name, - ); + "cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name `.", + crate_name, + ); } } diff --git a/src/steps/owner.rs b/src/steps/owner.rs index 1b4ac8837..441d43c3e 100644 --- a/src/steps/owner.rs +++ b/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; }; diff --git a/src/steps/publish.rs b/src/steps/publish.rs index 72f22e118..3938c7256 100644 --- a/src/steps/publish.rs +++ b/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; }; diff --git a/src/steps/push.rs b/src/steps/push.rs index cd6f8e79d..61db99cbd 100644 --- a/src/steps/push.rs +++ b/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; }; diff --git a/src/steps/release.rs b/src/steps/release.rs index d1a8a73bf..2d94f59eb 100644 --- a/src/steps/release.rs +++ b/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; }; diff --git a/src/steps/replace.rs b/src/steps/replace.rs index b16a17e60..bb9b8a669 100644 --- a/src/steps/replace.rs +++ b/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; }; diff --git a/src/steps/tag.rs b/src/steps/tag.rs index 18d518a1f..a440727e5 100644 --- a/src/steps/tag.rs +++ b/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; }; diff --git a/src/steps/version.rs b/src/steps/version.rs index 482f334f6..88006d508 100644 --- a/src/steps/version.rs +++ b/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; }; diff --git a/tests/testsuite/version/downgrade_error/mod.rs b/tests/testsuite/version/downgrade_error/mod.rs index 0b78d7486..af46a90cd 100644 --- a/tests/testsuite/version/downgrade_error/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/dry_run/mod.rs b/tests/testsuite/version/dry_run/mod.rs index ac8f7ab09..47dab50b4 100644 --- a/tests/testsuite/version/dry_run/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/ignore_dependent/mod.rs b/tests/testsuite/version/ignore_dependent/mod.rs index 329b1c6da..eef9f39d9 100644 --- a/tests/testsuite/version/ignore_dependent/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/set_absolute_version/mod.rs b/tests/testsuite/version/set_absolute_version/mod.rs index 0dcd17d36..05e7e9051 100644 --- a/tests/testsuite/version/set_absolute_version/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/set_absolute_workspace_version/mod.rs b/tests/testsuite/version/set_absolute_workspace_version/mod.rs index e7071c746..11bd3f6e3 100644 --- a/tests/testsuite/version/set_absolute_workspace_version/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/set_relative_version/mod.rs b/tests/testsuite/version/set_relative_version/mod.rs index 2be95d329..c379f8dc1 100644 --- a/tests/testsuite/version/set_relative_version/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/set_relative_workspace_version/mod.rs b/tests/testsuite/version/set_relative_workspace_version/mod.rs index acd650ac2..b2aba043e 100644 --- a/tests/testsuite/version/set_relative_workspace_version/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/upgrade_compatible_dependency/mod.rs b/tests/testsuite/version/upgrade_compatible_dependency/mod.rs index b4cccb364..dc84e6776 100644 --- a/tests/testsuite/version/upgrade_compatible_dependency/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/upgrade_incompatible_dependency/mod.rs b/tests/testsuite/version/upgrade_incompatible_dependency/mod.rs index 25310c3af..fcd9e1700 100644 --- a/tests/testsuite/version/upgrade_incompatible_dependency/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/upgrade_workspace/mod.rs b/tests/testsuite/version/upgrade_workspace/mod.rs index 9c19d5662..ae664c134 100644 --- a/tests/testsuite/version/upgrade_workspace/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/virtual_workspace_deps/mod.rs b/tests/testsuite/version/virtual_workspace_deps/mod.rs index 9c19d5662..ae664c134 100644 --- a/tests/testsuite/version/virtual_workspace_deps/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/workspace_deps/mod.rs b/tests/testsuite/version/workspace_deps/mod.rs index 9c19d5662..ae664c134 100644 --- a/tests/testsuite/version/workspace_deps/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/workspace_version_exclude/mod.rs b/tests/testsuite/version/workspace_version_exclude/mod.rs index 75661207e..ed6ed310a 100644 --- a/tests/testsuite/version/workspace_version_exclude/mod.rs +++ b/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() { diff --git a/tests/testsuite/version/workspace_version_subset/mod.rs b/tests/testsuite/version/workspace_version_subset/mod.rs index 7433e0ddb..141c8ebb8 100644 --- a/tests/testsuite/version/workspace_version_subset/mod.rs +++ b/tests/testsuite/version/workspace_version_subset/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() {