Merge pull request #959 from epage/upgrade

epage · web-flow · commit d6e89451b29d · 2026-04-17T15:09:37.000-05:00
chore: Upgrade dependencies
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,7 @@ required-features = ["set-version"]
 
 [dependencies]
 concolor-control = { version = "0.0.7", default-features = false }
-cargo_metadata = "0.21.0"
+cargo_metadata = "0.23.1"
 # Use this with default-features set to "true" (implicitly) so that reqwest,
 # a transitive dependency, is compiled with support for both webpki
 # certificates AND native certificates. We want support for both to be
@@ -69,27 +69,26 @@ anyhow = "1.0"
 home = "0.5.12"
 serde = "1.0.228"
 serde_derive = "1.0.228"
-clap = { version = "4.5.51", features = ["derive", "wrap_help"], optional = true }
-clap-cargo = "0.16.0"
+clap = { version = "4.6.1", features = ["derive", "wrap_help"], optional = true }
+clap-cargo = "0.18.3"
 termcolor = "1.4.1"
-toml = "0.9.8"
-toml_edit = "0.23.7"
+toml = "1.1.2"
+toml_edit = "0.25.11"
 indexmap = "2"
-url = "2.5.7"
+url = "2.5.8"
 pathdiff = "0.2"
-env_logger = "0.11.8"
+env_logger = "0.11.10"
 clap-verbosity-flag = "3.0.4"
-log = "0.4.28"
+log = "0.4.29"
 
 [dependencies.semver]
 features = ["serde"]
-version = "1.0.27"
+version = "1.0.28"
 
 [dev-dependencies]
-trycmd = "0.15.10"
-snapbox = { version = "0.6.23", features = ["cmd", "path"] }
-cargo-test-macro = "0.4.6"
-cargo-test-support = "0.7.5"
+trycmd = "1.2.0"
+snapbox = { version = "0.6.24", features = ["cmd", "path"] }
+cargo-test-support = "0.10.0"
 
 [profile.release]
 panic = "abort"
diff --git a/tests/cargo-set-version/downgrade_error/mod.rs b/tests/cargo-set-version/downgrade_error/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/dry_run/mod.rs b/tests/cargo-set-version/dry_run/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/ignore_dependent/mod.rs b/tests/cargo-set-version/ignore_dependent/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/main.rs b/tests/cargo-set-version/main.rs
@@ -2,9 +2,6 @@
 #![warn(clippy::needless_borrow)]
 #![warn(clippy::redundant_clone)]
 
-#[macro_use]
-extern crate cargo_test_macro;
-
 mod downgrade_error;
 mod dry_run;
 mod ignore_dependent;
diff --git a/tests/cargo-set-version/relative_absolute_conflict/mod.rs b/tests/cargo-set-version/relative_absolute_conflict/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/set_absolute_version/mod.rs b/tests/cargo-set-version/set_absolute_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/set_relative_version/mod.rs b/tests/cargo-set-version/set_relative_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/set_relative_workspace_version/mod.rs b/tests/cargo-set-version/set_relative_workspace_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/upgrade_workspace/mod.rs b/tests/cargo-set-version/upgrade_workspace/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/virtual_workspace_deps/mod.rs b/tests/cargo-set-version/virtual_workspace_deps/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/workspace_deps/mod.rs b/tests/cargo-set-version/workspace_deps/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/workspace_version_exclude/mod.rs b/tests/cargo-set-version/workspace_version_exclude/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-set-version/workspace_version_subset/mod.rs b/tests/cargo-set-version/workspace_version_subset/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/alt_registry/mod.rs b/tests/cargo-upgrade/alt_registry/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_alt_registry;
diff --git a/tests/cargo-upgrade/cli_rust_version/mod.rs b/tests/cargo-upgrade/cli_rust_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/dry_run/mod.rs b/tests/cargo-upgrade/dry_run/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/exclude_dep/mod.rs b/tests/cargo-upgrade/exclude_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/exclude_renamed/mod.rs b/tests/cargo-upgrade/exclude_renamed/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/ignore_rust_version/mod.rs b/tests/cargo-upgrade/ignore_rust_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/implicit_prerelease/mod.rs b/tests/cargo-upgrade/implicit_prerelease/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/invalid_dep/mod.rs b/tests/cargo-upgrade/invalid_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/invalid_flag/mod.rs b/tests/cargo-upgrade/invalid_flag/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/invalid_manifest/mod.rs b/tests/cargo-upgrade/invalid_manifest/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/locked/mod.rs b/tests/cargo-upgrade/locked/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/locked_dry_run/mod.rs b/tests/cargo-upgrade/locked_dry_run/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/lockfile/mod.rs b/tests/cargo-upgrade/lockfile/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/main.rs b/tests/cargo-upgrade/main.rs
@@ -2,9 +2,6 @@
 #![warn(clippy::needless_borrow)]
 #![warn(clippy::redundant_clone)]
 
-#[macro_use]
-extern crate cargo_test_macro;
-
 mod alt_registry;
 mod cli_rust_version;
 mod dry_run;
diff --git a/tests/cargo-upgrade/optional_dep/mod.rs b/tests/cargo-upgrade/optional_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/package_rust_version/mod.rs b/tests/cargo-upgrade/package_rust_version/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/pinned/mod.rs b/tests/cargo-upgrade/pinned/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/preserve_op/mod.rs b/tests/cargo-upgrade/preserve_op/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/preserve_precision_major/mod.rs b/tests/cargo-upgrade/preserve_precision_major/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/preserve_precision_minor/mod.rs b/tests/cargo-upgrade/preserve_precision_minor/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/preserve_precision_patch/mod.rs b/tests/cargo-upgrade/preserve_precision_patch/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/preserves_inline_table/mod.rs b/tests/cargo-upgrade/preserves_inline_table/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/preserves_std_table/mod.rs b/tests/cargo-upgrade/preserves_std_table/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/single_dep/mod.rs b/tests/cargo-upgrade/single_dep/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/skip_compatible/mod.rs b/tests/cargo-upgrade/skip_compatible/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use cargo_test_support::current_dir;
diff --git a/tests/cargo-upgrade/specified/mod.rs b/tests/cargo-upgrade/specified/mod.rs
@@ -1,6 +1,7 @@
 use cargo_test_support::Project;
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::file;
+use cargo_test_support::prelude::*;
 
 use crate::CargoCommand;
 use crate::init_registry;
diff --git a/tests/cargo-upgrade/to_version/mod.rs b/tests/cargo-upgrade/to_version/mod.rs
diff --git a/tests/cargo-upgrade/upgrade_all/mod.rs b/tests/cargo-upgrade/upgrade_all/mod.rs
diff --git a/tests/cargo-upgrade/upgrade_everything/mod.rs b/tests/cargo-upgrade/upgrade_everything/mod.rs
diff --git a/tests/cargo-upgrade/upgrade_renamed/mod.rs b/tests/cargo-upgrade/upgrade_renamed/mod.rs
diff --git a/tests/cargo-upgrade/upgrade_verbose/mod.rs b/tests/cargo-upgrade/upgrade_verbose/mod.rs
diff --git a/tests/cargo-upgrade/upgrade_workspace/mod.rs b/tests/cargo-upgrade/upgrade_workspace/mod.rs
diff --git a/tests/cargo-upgrade/virtual_manifest/mod.rs b/tests/cargo-upgrade/virtual_manifest/mod.rs
diff --git a/tests/cargo-upgrade/workspace_inheritance/mod.rs b/tests/cargo-upgrade/workspace_inheritance/mod.rs
diff --git a/tests/cargo-upgrade/workspace_member_cwd/mod.rs b/tests/cargo-upgrade/workspace_member_cwd/mod.rs
diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs
