Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,161 changes: 645 additions & 516 deletions Cargo.lock

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/downgrade_error/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/dry_run/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/ignore_dependent/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 0 additions & 3 deletions tests/cargo-set-version/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/relative_absolute_conflict/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/set_absolute_version/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/set_relative_version/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/upgrade_workspace/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/virtual_workspace_deps/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/workspace_deps/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/workspace_version_exclude/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-set-version/workspace_version_subset/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/alt_registry/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/cli_rust_version/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/dry_run/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/exclude_dep/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/exclude_renamed/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/ignore_rust_version/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/implicit_prerelease/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/invalid_dep/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/invalid_flag/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/invalid_manifest/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/locked/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/locked_dry_run/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/lockfile/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 0 additions & 3 deletions tests/cargo-upgrade/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/optional_dep/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/package_rust_version/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/pinned/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/preserve_op/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/preserve_precision_major/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/preserve_precision_minor/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/preserve_precision_patch/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/preserves_inline_table/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/preserves_std_table/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/single_dep/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/skip_compatible/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/cargo-upgrade/specified/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading