From 51c54c7be1b4c90c079344db230d7ec9c8542af5 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 15:00:12 -0500 Subject: [PATCH 1/8] chore: Update time --- Cargo.lock | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9a499292e..2835b8e07d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -602,10 +602,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ + "powerfmt", "serde", ] @@ -1171,6 +1172,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-traits" version = "0.2.16" @@ -1321,6 +1328,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "predicates" version = "3.0.3" @@ -1796,12 +1809,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -1809,16 +1824,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] From 5669fc91fa6007e7728397df45a7ee884b1c89c9 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 15:01:14 -0500 Subject: [PATCH 2/8] test: Update for latest cargo --- tests/cargo-upgrade/alt_registry/stderr.log | 1 + tests/cargo-upgrade/cli_rust_version/stderr.log | 1 + tests/cargo-upgrade/exclude_dep/stderr.log | 1 + tests/cargo-upgrade/ignore_rust_version/stderr.log | 1 + tests/cargo-upgrade/implicit_prerelease/stderr.log | 1 + tests/cargo-upgrade/lockfile/stderr.log | 1 + tests/cargo-upgrade/optional_dep/stderr.log | 1 + tests/cargo-upgrade/package_rust_version/stderr.log | 1 + tests/cargo-upgrade/pinned/stderr.log | 1 + tests/cargo-upgrade/preserve_op/stderr.log | 1 + tests/cargo-upgrade/preserve_precision_major/stderr.log | 1 + tests/cargo-upgrade/preserve_precision_minor/stderr.log | 1 + tests/cargo-upgrade/preserve_precision_patch/stderr.log | 1 + tests/cargo-upgrade/preserves_inline_table/stderr.log | 1 + tests/cargo-upgrade/preserves_std_table/stderr.log | 1 + tests/cargo-upgrade/single_dep/stderr.log | 1 + tests/cargo-upgrade/specified/stderr.log | 1 + tests/cargo-upgrade/upgrade_all/stderr.log | 1 + tests/cargo-upgrade/upgrade_everything/stderr.log | 1 + tests/cargo-upgrade/upgrade_renamed/stderr.log | 1 + tests/cargo-upgrade/upgrade_verbose/stderr.log | 1 + tests/cargo-upgrade/upgrade_workspace/stderr.log | 1 + tests/cargo-upgrade/virtual_manifest/stderr.log | 1 + tests/cargo-upgrade/workspace_inheritance/stderr.log | 1 + tests/cargo-upgrade/workspace_member_cwd/stderr.log | 1 + tests/cargo-upgrade/workspace_member_manifest_path/stderr.log | 1 + 26 files changed, 26 insertions(+) diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log index b285e5b366..670ecfe575 100644 --- a/tests/cargo-upgrade/alt_registry/stderr.log +++ b/tests/cargo-upgrade/alt_registry/stderr.log @@ -4,3 +4,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.log b/tests/cargo-upgrade/cli_rust_version/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/cli_rust_version/stderr.log +++ b/tests/cargo-upgrade/cli_rust_version/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log index dcb52a026d..7ed0b2fc30 100644 --- a/tests/cargo-upgrade/exclude_dep/stderr.log +++ b/tests/cargo-upgrade/exclude_dep/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.log b/tests/cargo-upgrade/ignore_rust_version/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/ignore_rust_version/stderr.log +++ b/tests/cargo-upgrade/ignore_rust_version/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/implicit_prerelease/stderr.log +++ b/tests/cargo-upgrade/implicit_prerelease/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/lockfile/stderr.log b/tests/cargo-upgrade/lockfile/stderr.log index 4b8fa2063e..6c713e4ebf 100644 --- a/tests/cargo-upgrade/lockfile/stderr.log +++ b/tests/cargo-upgrade/lockfile/stderr.log @@ -7,3 +7,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/optional_dep/stderr.log +++ b/tests/cargo-upgrade/optional_dep/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/package_rust_version/stderr.log b/tests/cargo-upgrade/package_rust_version/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/package_rust_version/stderr.log +++ b/tests/cargo-upgrade/package_rust_version/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log index 7604656e75..7903eb2c84 100644 --- a/tests/cargo-upgrade/pinned/stderr.log +++ b/tests/cargo-upgrade/pinned/stderr.log @@ -3,4 +3,5 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/preserve_op/stderr.log b/tests/cargo-upgrade/preserve_op/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/preserve_op/stderr.log +++ b/tests/cargo-upgrade/preserve_op/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/preserve_precision_major/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_major/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/preserves_inline_table/stderr.log +++ b/tests/cargo-upgrade/preserves_inline_table/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/preserves_std_table/stderr.log +++ b/tests/cargo-upgrade/preserves_std_table/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/single_dep/stderr.log +++ b/tests/cargo-upgrade/single_dep/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log index 28785278a6..dbdaebdb1f 100644 --- a/tests/cargo-upgrade/specified/stderr.log +++ b/tests/cargo-upgrade/specified/stderr.log @@ -3,5 +3,6 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions note: Re-run with `--verbose` to show more dependencies excluded: my-package2 diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log index 4b8fa2063e..6c713e4ebf 100644 --- a/tests/cargo-upgrade/upgrade_all/stderr.log +++ b/tests/cargo-upgrade/upgrade_all/stderr.log @@ -7,3 +7,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log index bcf2ce0fd4..c0d39316ed 100644 --- a/tests/cargo-upgrade/upgrade_everything/stderr.log +++ b/tests/cargo-upgrade/upgrade_everything/stderr.log @@ -3,5 +3,6 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions note: Re-run with `--verbose` to show more dependencies latest: serde diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log index bb7bff6d67..59c1bfdbf1 100644 --- a/tests/cargo-upgrade/upgrade_renamed/stderr.log +++ b/tests/cargo-upgrade/upgrade_renamed/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.log b/tests/cargo-upgrade/upgrade_verbose/stderr.log index dcb52a026d..7ed0b2fc30 100644 --- a/tests/cargo-upgrade/upgrade_verbose/stderr.log +++ b/tests/cargo-upgrade/upgrade_verbose/stderr.log @@ -3,3 +3,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log index 4b8fa2063e..6c713e4ebf 100644 --- a/tests/cargo-upgrade/upgrade_workspace/stderr.log +++ b/tests/cargo-upgrade/upgrade_workspace/stderr.log @@ -7,3 +7,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log index 4b8fa2063e..6c713e4ebf 100644 --- a/tests/cargo-upgrade/virtual_manifest/stderr.log +++ b/tests/cargo-upgrade/virtual_manifest/stderr.log @@ -7,3 +7,4 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.log b/tests/cargo-upgrade/workspace_inheritance/stderr.log index 6214f4d638..32a5001869 100644 --- a/tests/cargo-upgrade/workspace_inheritance/stderr.log +++ b/tests/cargo-upgrade/workspace_inheritance/stderr.log @@ -7,5 +7,6 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions note: Re-run with `--verbose` to show more dependencies local: three diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log index 6f3d82d146..6aacb7898a 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log +++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.log @@ -7,5 +7,6 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions note: Re-run with `--verbose` to show more dependencies excluded: three diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log index 6f3d82d146..6aacb7898a 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log @@ -7,5 +7,6 @@ Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + Locking 0 packages to latest compatible versions note: Re-run with `--verbose` to show more dependencies excluded: three From 84e53878aa5e4194a9b27ed500b196cf09af1191 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 15:01:54 -0500 Subject: [PATCH 3/8] refactor: Remove unused available_features This is left over from `cargo-add` --- src/fetch.rs | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/src/fetch.rs b/src/fetch.rs index 9b42bb4069..ea14376130 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -1,4 +1,3 @@ -use std::collections::BTreeMap; use std::path::Path; use std::time::Duration; @@ -152,7 +151,6 @@ struct CrateVersion { version: semver::Version, rust_version: Option, yanked: bool, - available_features: BTreeMap>, } /// Fuzzy query crate from registry index @@ -183,7 +181,6 @@ fn fuzzy_query_registry_index( version: v.version().parse()?, rust_version: v.rust_version().map(|r| r.parse()).transpose()?, yanked: v.is_yanked(), - available_features: registry_features(v), }) }) .collect(); @@ -264,9 +261,7 @@ fn read_latest_version( let name = &latest.name; let version = latest.version.to_string(); - Ok(Dependency::new(name) - .set_source(RegistrySource::new(version)) - .set_available_features(latest.available_features.clone())) + Ok(Dependency::new(name).set_source(RegistrySource::new(version))) } fn read_compatible_version( @@ -297,24 +292,7 @@ fn read_compatible_version( let name = &latest.name; let version = latest.version.to_string(); - Ok(Dependency::new(name) - .set_source(RegistrySource::new(version)) - .set_available_features(latest.available_features.clone())) -} - -fn registry_features(v: &crates_index::Version) -> BTreeMap> { - let mut features: BTreeMap<_, _> = v - .features() - .iter() - .map(|(k, v)| (k.clone(), v.clone())) - .collect(); - features.extend( - v.dependencies() - .iter() - .filter(|d| d.is_optional()) - .map(|d| (d.crate_name().to_owned(), vec![])), - ); - features + Ok(Dependency::new(name).set_source(RegistrySource::new(version))) } /// update registry index for given project @@ -380,14 +358,12 @@ fn get_latest_stable_version() { version: "0.6.0-alpha".parse().unwrap(), rust_version: None, yanked: false, - available_features: BTreeMap::new(), }, CrateVersion { name: "foo".into(), version: "0.5.0".parse().unwrap(), rust_version: None, yanked: false, - available_features: BTreeMap::new(), }, ]; assert_eq!( @@ -407,14 +383,12 @@ fn get_latest_unstable_or_stable_version() { version: "0.6.0-alpha".parse().unwrap(), rust_version: None, yanked: false, - available_features: BTreeMap::new(), }, CrateVersion { name: "foo".into(), version: "0.5.0".parse().unwrap(), rust_version: None, yanked: false, - available_features: BTreeMap::new(), }, ]; assert_eq!( @@ -434,14 +408,12 @@ fn get_latest_version_with_yanked() { version: "0.3.1".parse().unwrap(), rust_version: None, yanked: true, - available_features: BTreeMap::new(), }, CrateVersion { name: "true".into(), version: "0.3.0".parse().unwrap(), rust_version: None, yanked: false, - available_features: BTreeMap::new(), }, ]; assert_eq!( @@ -461,14 +433,12 @@ fn get_no_latest_version_from_json_when_all_are_yanked() { version: "0.3.1".parse().unwrap(), rust_version: None, yanked: true, - available_features: BTreeMap::new(), }, CrateVersion { name: "true".into(), version: "0.3.0".parse().unwrap(), rust_version: None, yanked: true, - available_features: BTreeMap::new(), }, ]; assert!(read_latest_version(&versions, false, None).is_err()); From dd7b444240d8d908a2813414e4c9b6c1072507dc Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 15:08:06 -0500 Subject: [PATCH 4/8] fix!: Remove --offline support This is prep for sparse index. Without a caching strategy, we have no offline support. --- README.md | 1 - src/bin/upgrade/upgrade.rs | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b32a8696e4..76792bddb5 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,6 @@ Options: --manifest-path Path to the manifest to upgrade --rust-version Override `rust-version` --ignore-rust-version Ignore `rust-version` specification in packages - --offline Run without accessing the network --locked Require `Cargo.toml` to be up to date -v, --verbose... Use verbose output -Z Unstable (nightly-only) flags diff --git a/src/bin/upgrade/upgrade.rs b/src/bin/upgrade/upgrade.rs index 42d6863a78..b7ed762c62 100644 --- a/src/bin/upgrade/upgrade.rs +++ b/src/bin/upgrade/upgrade.rs @@ -34,10 +34,6 @@ pub struct UpgradeArgs { #[arg(long)] ignore_rust_version: bool, - /// Run without accessing the network - #[arg(long)] - offline: bool, - /// Require `Cargo.toml` to be up to date #[arg(long)] locked: bool, @@ -160,12 +156,13 @@ enum UnstableOptions {} /// Main processing function. Allows us to return a `Result` so that `main` can print pretty error /// messages. fn exec(args: UpgradeArgs) -> CargoResult<()> { - if !args.offline { + let offline = false; + if !offline { let url = registry_url(&find(args.manifest_path.as_deref())?, None)?; update_registry_index(&url, false)?; } - let metadata = resolve_ws(args.manifest_path.as_deref(), args.locked, args.offline)?; + let metadata = resolve_ws(args.manifest_path.as_deref(), args.locked, offline)?; let root_manifest_path = metadata.workspace_root.as_std_path().join("Cargo.toml"); let manifests = find_ws_members(&metadata); let mut manifests = manifests @@ -299,7 +296,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { .registry() .map(|registry| registry_url(&manifest_path, Some(registry))) .transpose()?; - if !args.offline { + if !offline { if let Some(registry_url) = ®istry_url { if updated_registries.insert(registry_url.to_owned()) { update_registry_index(registry_url, false)?; @@ -475,7 +472,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { } else if args.dry_run { } else { // Ensure lock file is updated and collect data for `recursive` - let metadata = resolve_ws(Some(&root_manifest_path), args.locked, args.offline)?; + let metadata = resolve_ws(Some(&root_manifest_path), args.locked, offline)?; let mut locked = metadata.packages; let precise_deps = selected_dependencies From 1babc04ddf8c8f509b98ecfa07a74e2cb3aba6ee Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 15:11:35 -0500 Subject: [PATCH 5/8] chore: Remove lints related to API --- src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 805db83ecf..70afa30bde 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,8 +9,6 @@ #![recursion_limit = "256"] #![cfg_attr(test, allow(dead_code))] #![warn( - missing_docs, - missing_debug_implementations, missing_copy_implementations, trivial_casts, trivial_numeric_casts, From fc30f68bc5516d5698d37f38860f0f9bfdec4612 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 15:19:23 -0500 Subject: [PATCH 6/8] fix!: Use the sparse registry BREAKING CHANGE: This removes some features related to git --- Cargo.lock | 1027 +++++++++++++++-- Cargo.toml | 11 +- src/bin/upgrade/upgrade.rs | 49 +- src/fetch.rs | 83 +- src/index.rs | 258 +++++ src/lib.rs | 6 +- src/registry.rs | 2 +- tests/cargo-upgrade/alt_registry/stderr.log | 2 - .../cargo-upgrade/cli_rust_version/stderr.log | 1 - tests/cargo-upgrade/dry_run/stderr.log | 1 - tests/cargo-upgrade/exclude_dep/stderr.log | 1 - .../cargo-upgrade/exclude_renamed/stderr.log | 1 - .../ignore_rust_version/stderr.log | 1 - .../implicit_prerelease/stderr.log | 1 - tests/cargo-upgrade/invalid_dep/stderr.log | 1 - .../cargo-upgrade/invalid_manifest/stderr.log | 1 - .../stderr.log | 1 - tests/cargo-upgrade/locked/stderr.log | 1 - tests/cargo-upgrade/locked_dry_run/stderr.log | 1 - tests/cargo-upgrade/lockfile/stderr.log | 1 - tests/cargo-upgrade/optional_dep/stderr.log | 1 - .../package_rust_version/stderr.log | 1 - tests/cargo-upgrade/pinned/stderr.log | 1 - tests/cargo-upgrade/preserve_op/stderr.log | 1 - .../preserve_precision_major/stderr.log | 1 - .../preserve_precision_minor/stderr.log | 1 - .../preserve_precision_patch/stderr.log | 1 - .../preserves_inline_table/stderr.log | 1 - .../preserves_std_table/stderr.log | 1 - tests/cargo-upgrade/single_dep/stderr.log | 1 - .../cargo-upgrade/skip_compatible/stderr.log | 1 - tests/cargo-upgrade/specified/stderr.log | 1 - tests/cargo-upgrade/to_version/stderr.log | 1 - tests/cargo-upgrade/upgrade_all/stderr.log | 1 - .../upgrade_everything/stderr.log | 1 - .../cargo-upgrade/upgrade_renamed/stderr.log | 1 - .../cargo-upgrade/upgrade_verbose/stderr.log | 1 - .../upgrade_workspace/stderr.log | 1 - .../cargo-upgrade/virtual_manifest/stderr.log | 1 - .../workspace_inheritance/stderr.log | 1 - .../workspace_member_cwd/stderr.log | 1 - .../workspace_member_manifest_path/stderr.log | 1 - 42 files changed, 1244 insertions(+), 228 deletions(-) create mode 100644 src/index.rs diff --git a/Cargo.lock b/Cargo.lock index 2835b8e07d..0a3d221f51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,27 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aho-corasick" version = "1.0.4" @@ -67,7 +82,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -77,7 +92,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -87,7 +102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -128,6 +143,25 @@ dependencies = [ "tempfile", ] +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -145,12 +179,33 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide 0.8.0", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + [[package]] name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -195,6 +250,18 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + [[package]] name = "camino" version = "1.1.6" @@ -217,10 +284,8 @@ dependencies = [ "clap", "clap-cargo", "concolor-control", - "crates-index", "dunce", "env_proxy", - "git2", "hex", "home", "indexmap 1.9.3", @@ -233,6 +298,7 @@ dependencies = [ "serde_json", "snapbox", "subprocess", + "tame-index", "termcolor", "toml", "toml_edit", @@ -278,7 +344,7 @@ dependencies = [ "time", "toml", "url", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -299,7 +365,7 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -446,26 +512,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crates-index" -version = "0.19.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cab38e209d6ba8bd5b0d41c784ec63a5a9ea3adf866b820d377588960f1ded" -dependencies = [ - "git2", - "hex", - "home", - "memchr", - "rayon", - "rustc-hash", - "semver", - "serde", - "serde_derive", - "serde_json", - "smol_str", - "toml", -] - [[package]] name = "crates-io" version = "0.39.0" @@ -570,7 +616,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.9", "winapi", ] @@ -714,7 +760,7 @@ checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -758,7 +804,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -769,7 +815,7 @@ checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -796,6 +842,56 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -820,6 +916,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + [[package]] name = "git2" version = "0.17.2" @@ -876,6 +978,25 @@ dependencies = [ "subtle", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.0.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -905,18 +1026,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] [[package]] name = "hkdf" @@ -942,9 +1060,49 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", ] +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + [[package]] name = "humantime" version = "2.1.0" @@ -961,6 +1119,65 @@ dependencies = [ "serde", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-native-certs 0.8.0", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "idna" version = "0.4.0" @@ -1014,20 +1231,26 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.9", "libc", - "windows-sys", + "windows-sys 0.48.0", ] +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" + [[package]] name = "is-terminal" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.9", "rustix 0.38.9", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1071,9 +1294,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libgit2-sys" @@ -1148,6 +1371,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1157,13 +1386,34 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "miow" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1193,15 +1443,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.9", "libc", ] +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl-probe" @@ -1209,15 +1468,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "111.27.0+1.1.1v" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.91" @@ -1226,7 +1476,6 @@ checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -1249,7 +1498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1306,12 +1555,38 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkcs8" version = "0.10.2" @@ -1334,6 +1609,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + [[package]] name = "predicates" version = "3.0.3" @@ -1383,6 +1667,54 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.33" @@ -1392,6 +1724,27 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + [[package]] name = "rand_core" version = "0.6.4" @@ -1461,6 +1814,53 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "async-compression", + "base64", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-native-certs 0.7.3", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -1472,14 +1872,35 @@ dependencies = [ ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "ring" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] [[package]] -name = "rustix" -version = "0.37.23" +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustix" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ @@ -1488,7 +1909,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1501,7 +1922,74 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.5", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -1525,7 +2013,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1548,6 +2036,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.18" @@ -1597,6 +2108,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha2" version = "0.10.7" @@ -1636,6 +2159,21 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + [[package]] name = "smol_str" version = "0.2.0" @@ -1664,7 +2202,7 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1686,6 +2224,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.7.2" @@ -1696,6 +2250,12 @@ dependencies = [ "der", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.10.0" @@ -1720,15 +2280,50 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "tame-index" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22e7b1003e6348cceb96e70f68523e22d2a298869ebe6d778a2207e45dc2f97" +dependencies = [ + "bytes", + "camino", + "crossbeam-channel", + "home", + "http", + "libc", + "memchr", + "rayon", + "reqwest", + "semver", + "serde", + "serde_json", + "sha2", + "smol_str", + "thiserror", + "tokio", + "toml-span", + "twox-hash", +] + [[package]] name = "tar" version = "0.4.40" @@ -1749,7 +2344,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix 0.38.9", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1768,7 +2363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ "rustix 0.37.23", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1853,6 +2448,45 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2 0.5.7", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.7.6" @@ -1865,6 +2499,15 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "toml-span" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce0e1be49e3b9bf33d1a8077c081a3b7afcfc94e4bc1002c80376784381bc106" +dependencies = [ + "smallvec", +] + [[package]] name = "toml_datetime" version = "0.6.3" @@ -1887,6 +2530,33 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + [[package]] name = "tracing" version = "0.1.37" @@ -1919,6 +2589,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "trycmd" version = "0.14.17" @@ -1935,6 +2611,16 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typenum" version = "1.16.0" @@ -1962,6 +2648,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.0" @@ -2010,6 +2702,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2041,6 +2742,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.87" @@ -2070,6 +2783,25 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2101,13 +2833,61 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2116,13 +2896,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2131,42 +2927,90 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winnow" version = "0.5.15" @@ -2176,8 +3020,29 @@ dependencies = [ "memchr", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/Cargo.toml b/Cargo.toml index 41d7ec4bf2..7676b23371 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,11 +58,15 @@ required-features = ["set-version"] [dependencies] concolor-control = { version = "0.0.7", default-features = false } cargo_metadata = "0.15.4" -crates-index = "0.19.13" +# 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 +# present, and then to let the user _select_ through configuration which +# one they want to be used. +tame-index = { version = "0.13", features = ["sparse", "native-certs", "local"] } dunce = "1.0" env_proxy = "0.4.1" anyhow = "1.0" -git2 = "0.17" hex = "0.4.3" home = "0.5.5" regex = "1.9.4" @@ -99,7 +103,6 @@ default = [ "rm", "upgrade", "set-version", - "vendored-libgit2", ] add = ["cli"] rm = ["cli"] @@ -108,5 +111,3 @@ set-version = ["cli"] cli = ["color", "clap"] color = ["concolor-control/auto"] test-external-apis = [] -vendored-openssl = ["git2/vendored-openssl"] -vendored-libgit2 = ["git2/vendored-libgit2"] diff --git a/src/bin/upgrade/upgrade.rs b/src/bin/upgrade/upgrade.rs index b7ed762c62..86b15b48fd 100644 --- a/src/bin/upgrade/upgrade.rs +++ b/src/bin/upgrade/upgrade.rs @@ -5,9 +5,9 @@ use std::path::PathBuf; use anyhow::Context as _; use cargo_edit::{ - find, get_compatible_dependency, get_latest_dependency, registry_url, set_dep_version, - shell_note, shell_status, shell_warn, shell_write_stdout, update_registry_index, CargoResult, - CrateSpec, Dependency, LocalManifest, RustVersion, Source, + get_compatible_dependency, get_latest_dependency, registry_url, set_dep_version, shell_note, + shell_status, shell_warn, shell_write_stdout, CargoResult, CertsSource, CrateSpec, Dependency, + IndexCache, LocalManifest, RustVersion, Source, }; use clap::Args; use indexmap::IndexMap; @@ -157,10 +157,7 @@ enum UnstableOptions {} /// messages. fn exec(args: UpgradeArgs) -> CargoResult<()> { let offline = false; - if !offline { - let url = registry_url(&find(args.manifest_path.as_deref())?, None)?; - update_registry_index(&url, false)?; - } + let mut index = IndexCache::new(CertsSource::Native); let metadata = resolve_ws(args.manifest_path.as_deref(), args.locked, offline)?; let root_manifest_path = metadata.workspace_root.as_std_path().join("Cargo.toml"); @@ -209,7 +206,6 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { .collect::>>>()?; let mut processed_keys = BTreeSet::new(); - let mut updated_registries = BTreeSet::new(); let mut modified_crates = BTreeSet::new(); let mut git_crates = BTreeSet::new(); let mut pinned_present = false; @@ -292,17 +288,8 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { { // Update indices for any alternative registries, unless // we're offline. - let registry_url = dependency - .registry() - .map(|registry| registry_url(&manifest_path, Some(registry))) - .transpose()?; - if !offline { - if let Some(registry_url) = ®istry_url { - if updated_registries.insert(registry_url.to_owned()) { - update_registry_index(registry_url, false)?; - } - } - } + let registry_url = registry_url(&manifest_path, dependency.registry())?; + let index = index.index(®istry_url)?; let latest_compatible = VersionReq::parse(&old_version_req) .ok() .and_then(|old_version_req| { @@ -310,8 +297,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { &dependency.name, &old_version_req, rust_version, - &manifest_path, - registry_url.as_ref(), + index, ) .ok() }) @@ -321,19 +307,14 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { .to_owned() }); let is_prerelease = old_version_req.contains('-'); - let latest_version = get_latest_dependency( - &dependency.name, - is_prerelease, - rust_version, - &manifest_path, - registry_url.as_ref(), - ) - .map(|d| { - d.version() - .expect("registry packages always have a version") - .to_owned() - }) - .ok(); + let latest_version = + get_latest_dependency(&dependency.name, is_prerelease, rust_version, index) + .map(|d| { + d.version() + .expect("registry packages always have a version") + .to_owned() + }) + .ok(); let latest_incompatible = if latest_version != latest_compatible { latest_version } else { diff --git a/src/fetch.rs b/src/fetch.rs index ea14376130..25b80ce734 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -1,11 +1,5 @@ -use std::path::Path; -use std::time::Duration; - -use url::Url; - use super::errors::*; -use super::registry::registry_url; -use super::shell_status; +use super::AnyIndexCache; use super::Dependency; use super::RegistrySource; use super::VersionExt; @@ -24,19 +18,13 @@ pub fn get_latest_dependency( crate_name: &str, flag_allow_prerelease: bool, rust_version: Option, - manifest_path: &Path, - registry: Option<&Url>, + index: &mut AnyIndexCache, ) -> CargoResult { if crate_name.is_empty() { anyhow::bail!("Found empty crate name"); } - let registry = match registry { - Some(url) => url.clone(), - None => registry_url(manifest_path, None)?, - }; - - let crate_versions = fuzzy_query_registry_index(crate_name, ®istry)?; + let crate_versions = fuzzy_query_registry_index(crate_name, index)?; let dep = read_latest_version(&crate_versions, flag_allow_prerelease, rust_version)?; @@ -52,19 +40,13 @@ pub fn get_compatible_dependency( crate_name: &str, version_req: &semver::VersionReq, rust_version: Option, - manifest_path: &Path, - registry: Option<&Url>, + index: &mut AnyIndexCache, ) -> CargoResult { if crate_name.is_empty() { anyhow::bail!("Found empty crate name"); } - let registry = match registry { - Some(url) => url.clone(), - None => registry_url(manifest_path, None)?, - }; - - let crate_versions = fuzzy_query_registry_index(crate_name, ®istry)?; + let crate_versions = fuzzy_query_registry_index(crate_name, index)?; let dep = read_compatible_version(&crate_versions, version_req, rust_version)?; @@ -156,10 +138,8 @@ struct CrateVersion { /// Fuzzy query crate from registry index fn fuzzy_query_registry_index( crate_name: impl Into, - registry: &Url, + index: &mut AnyIndexCache, ) -> CargoResult> { - let index = crates_index::Index::from_url(registry.as_str())?; - let crate_name = crate_name.into(); let mut names = gen_fuzzy_crate_names(crate_name.clone())?; if let Some(index) = names.iter().position(|x| *x == crate_name) { @@ -168,19 +148,19 @@ fn fuzzy_query_registry_index( } for the_name in names { - let crate_ = match index.crate_(&the_name) { - Some(crate_) => crate_, - None => continue, + let krate = match index.krate(&the_name) { + Ok(Some(krate)) => krate, + _ => continue, }; - return crate_ - .versions() + return krate + .versions .iter() .map(|v| { Ok(CrateVersion { - name: v.name().to_owned(), - version: v.version().parse()?, - rust_version: v.rust_version().map(|r| r.parse()).transpose()?, - yanked: v.is_yanked(), + name: v.name.to_string(), + version: v.version.as_ref().parse()?, + rust_version: v.rust_version.as_ref().map(|r| r.parse()).transpose()?, + yanked: v.yanked, }) }) .collect(); @@ -295,39 +275,6 @@ fn read_compatible_version( Ok(Dependency::new(name).set_source(RegistrySource::new(version))) } -/// update registry index for given project -pub fn update_registry_index(registry: &Url, quiet: bool) -> CargoResult<()> { - let mut index = crates_index::Index::from_url(registry.as_str())?; - if !quiet { - shell_status("Updating", &format!("'{registry}' index"))?; - } - - while need_retry(index.update())? { - shell_status("Blocking", "waiting for lock on registry index")?; - std::thread::sleep(REGISTRY_BACKOFF); - } - - Ok(()) -} - -/// Time between retries for retrieving the registry. -const REGISTRY_BACKOFF: Duration = Duration::from_secs(1); - -/// Check if we need to retry retrieving the Index. -fn need_retry(res: Result<(), crates_index::Error>) -> CargoResult { - match res { - Ok(()) => Ok(false), - Err(crates_index::Error::Git(err)) => { - if err.class() == git2::ErrorClass::Index && err.code() == git2::ErrorCode::Locked { - Ok(true) - } else { - Err(crates_index::Error::Git(err).into()) - } - } - Err(err) => Err(err.into()), - } -} - #[test] fn test_gen_fuzzy_crate_names() { fn test_helper(input: &str, expect: &[&str]) { diff --git a/src/index.rs b/src/index.rs new file mode 100644 index 0000000000..1c189f22b6 --- /dev/null +++ b/src/index.rs @@ -0,0 +1,258 @@ +use tame_index::krate::IndexKrate; +use tame_index::utils::flock::FileLock; + +use url::Url; + +use super::errors::*; + +#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)] +pub enum CertsSource { + /// Use certs from Mozilla's root certificate store. + #[default] + Webpki, + /// Use certs from the system root certificate store. + Native, +} + +pub struct IndexCache { + certs_source: CertsSource, + index: std::collections::HashMap, +} + +impl IndexCache { + #[inline] + pub fn new(certs_source: CertsSource) -> Self { + Self { + certs_source, + index: Default::default(), + } + } + + /// Determines if the specified crate exists in the crates.io index + #[inline] + pub fn has_krate(&mut self, registry: &Url, name: &str) -> CargoResult { + self.index(registry)?.has_krate(name) + } + + /// Determines if the specified crate version exists in the crates.io index + #[inline] + pub fn has_krate_version( + &mut self, + registry: &Url, + name: &str, + version: &str, + ) -> CargoResult> { + self.index(registry)?.has_krate_version(name, version) + } + + #[inline] + pub fn update_krate(&mut self, registry: &Url, name: &str) -> CargoResult<()> { + self.index(registry)?.update_krate(name); + Ok(()) + } + + pub fn krate(&mut self, registry: &Url, name: &str) -> CargoResult> { + self.index(registry)?.krate(name) + } + + pub fn index<'s>(&'s mut self, registry: &Url) -> CargoResult<&'s mut AnyIndexCache> { + if !self.index.contains_key(registry) { + let index = AnyIndex::open(registry, self.certs_source)?; + let index = AnyIndexCache::new(index); + self.index.insert(registry.clone(), index); + } + Ok(self.index.get_mut(registry).unwrap()) + } +} + +pub struct AnyIndexCache { + index: AnyIndex, + cache: std::collections::HashMap>, +} + +impl AnyIndexCache { + #[inline] + pub fn new(index: AnyIndex) -> Self { + Self { + index, + cache: std::collections::HashMap::new(), + } + } + + /// Determines if the specified crate exists in the crates.io index + #[inline] + pub fn has_krate(&mut self, name: &str) -> CargoResult { + Ok(self.krate(name)?.map(|_| true).unwrap_or(false)) + } + + /// Determines if the specified crate version exists in the crates.io index + #[inline] + pub fn has_krate_version(&mut self, name: &str, version: &str) -> CargoResult> { + let krate = self.krate(name)?; + Ok(krate.map(|ik| ik.versions.iter().any(|iv| iv.version == version))) + } + + #[inline] + pub fn update_krate(&mut self, name: &str) { + self.cache.remove(name); + } + + pub fn krate(&mut self, name: &str) -> CargoResult> { + if let Some(entry) = self.cache.get(name) { + return Ok(entry.clone()); + } + + let entry = self.index.krate(name)?; + self.cache.insert(name.to_owned(), entry.clone()); + Ok(entry) + } +} + +pub enum AnyIndex { + Local(LocalIndex), + Remote(RemoteIndex), +} + +impl AnyIndex { + pub fn open(url: &Url, certs_source: CertsSource) -> CargoResult { + if url.scheme() == "file" { + LocalIndex::open(url).map(Self::Local) + } else { + RemoteIndex::open(url, certs_source).map(Self::Remote) + } + } + + pub(crate) fn krate(&mut self, name: &str) -> CargoResult> { + match self { + Self::Local(index) => index.krate(name), + Self::Remote(index) => index.krate(name), + } + } +} + +pub struct LocalIndex { + index: tame_index::index::LocalRegistry, + root: tame_index::PathBuf, +} + +impl LocalIndex { + pub fn open(url: &Url) -> CargoResult { + let path = url + .to_file_path() + .map_err(|()| anyhow::format_err!("invalid local registry {url}"))?; + let path = tame_index::PathBuf::from_path_buf(path) + .map_err(|_err| anyhow::format_err!("invalid local registry {url:?}"))?; + let index = tame_index::index::LocalRegistry::open(path.clone(), false)?; + Ok(Self { index, root: path }) + } + + pub(crate) fn krate(&mut self, name: &str) -> CargoResult> { + let name = tame_index::KrateName::cargo(name)?; + // HACK: for some reason, `tame_index` puts `index` in the middle + let entry_path = self.index.krate_path(name); + let rel_path = entry_path + .strip_prefix(&self.root) + .map_err(|_err| anyhow::format_err!("invalid index path {entry_path:?}"))?; + let rel_path = rel_path + .strip_prefix("index") + .map_err(|_err| anyhow::format_err!("invalid index path {entry_path:?}"))?; + let entry_path = self.root.join(rel_path); + let entry = std::fs::read(&entry_path)?; + let results = IndexKrate::from_slice(&entry)?; + Ok(Some(results)) + } +} + +pub struct RemoteIndex { + index: tame_index::SparseIndex, + client: tame_index::external::reqwest::blocking::Client, + lock: FileLock, + etags: Vec<(String, String)>, +} + +impl RemoteIndex { + pub fn open(url: &Url, certs_source: CertsSource) -> CargoResult { + let url = url.to_string(); + let url = tame_index::IndexUrl::NonCratesIo(std::borrow::Cow::Owned(url)); + let index = tame_index::SparseIndex::new(tame_index::IndexLocation::new(url))?; + + let client = { + let builder = tame_index::external::reqwest::blocking::ClientBuilder::new(); + + let builder = match certs_source { + CertsSource::Webpki => builder.tls_built_in_webpki_certs(true), + CertsSource::Native => builder.tls_built_in_native_certs(true), + }; + + builder.build()? + }; + + let lock = FileLock::unlocked(); + + Ok(Self { + index, + client, + lock, + etags: Vec::new(), + }) + } + + pub(crate) fn krate(&mut self, name: &str) -> CargoResult> { + let etag = self + .etags + .iter() + .find_map(|(krate, etag)| (krate == name).then_some(etag.as_str())) + .unwrap_or(""); + + let krate_name = name.try_into()?; + let req = self + .index + .make_remote_request(krate_name, Some(etag), &self.lock)?; + let ( + tame_index::external::http::request::Parts { + method, + uri, + version, + headers, + .. + }, + _, + ) = req.into_parts(); + let mut req = self.client.request(method, uri.to_string()); + req = req.version(version); + req = req.headers(headers); + let res = self.client.execute(req.build()?)?; + + // Grab the etag if it exists for future requests + if let Some(etag) = res + .headers() + .get(tame_index::external::reqwest::header::ETAG) + { + if let Ok(etag) = etag.to_str() { + if let Some(i) = self.etags.iter().position(|(krate, _)| krate == name) { + etag.clone_into(&mut self.etags[i].1); + } else { + self.etags.push((name.to_owned(), etag.to_owned())); + } + } + } + + let mut builder = tame_index::external::http::Response::builder() + .status(res.status()) + .version(res.version()); + + builder + .headers_mut() + .unwrap() + .extend(res.headers().iter().map(|(k, v)| (k.clone(), v.clone()))); + + let body = res.bytes()?; + let response = builder + .body(body.to_vec()) + .map_err(|e| tame_index::Error::from(tame_index::error::HttpError::from(e)))?; + + self.index + .parse_remote_response(krate_name, response, false, &self.lock) + .map_err(Into::into) + } +} diff --git a/src/lib.rs b/src/lib.rs index 70afa30bde..582a1bd24c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,6 +25,7 @@ mod crate_spec; mod dependency; mod errors; mod fetch; +mod index; mod manifest; mod metadata; mod registry; @@ -37,9 +38,8 @@ pub use dependency::PathSource; pub use dependency::RegistrySource; pub use dependency::Source; pub use errors::*; -pub use fetch::{ - get_compatible_dependency, get_latest_dependency, update_registry_index, RustVersion, -}; +pub use fetch::{get_compatible_dependency, get_latest_dependency, RustVersion}; +pub use index::*; pub use manifest::{find, get_dep_version, set_dep_version, LocalManifest, Manifest}; pub use metadata::manifest_from_pkgid; pub use registry::registry_url; diff --git a/src/registry.rs b/src/registry.rs index 4b8c31534f..f13dfce665 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::path::Path; use url::Url; -const CRATES_IO_INDEX: &str = "https://github.com/rust-lang/crates.io-index"; +const CRATES_IO_INDEX: &str = tame_index::index::sparse::CRATES_IO_HTTP_INDEX; const CRATES_IO_REGISTRY: &str = "crates-io"; /// Find the URL of a registry diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log index 670ecfe575..b04a31f535 100644 --- a/tests/cargo-upgrade/alt_registry/stderr.log +++ b/tests/cargo-upgrade/alt_registry/stderr.log @@ -1,6 +1,4 @@ - Updating '[ROOTURL]/registry' index Checking none's dependencies - Updating '[ROOTURL]/alternative-registry' index Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.log b/tests/cargo-upgrade/cli_rust_version/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/cli_rust_version/stderr.log +++ b/tests/cargo-upgrade/cli_rust_version/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/dry_run/stderr.log b/tests/cargo-upgrade/dry_run/stderr.log index 0dfbdd898e..1a63e3418e 100644 --- a/tests/cargo-upgrade/dry_run/stderr.log +++ b/tests/cargo-upgrade/dry_run/stderr.log @@ -1,3 +1,2 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies warning: aborting upgrade due to dry run diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log index 7ed0b2fc30..774ad6740f 100644 --- a/tests/cargo-upgrade/exclude_dep/stderr.log +++ b/tests/cargo-upgrade/exclude_dep/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking None's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/exclude_renamed/stderr.log b/tests/cargo-upgrade/exclude_renamed/stderr.log index 1455005458..8055d9fa2a 100644 --- a/tests/cargo-upgrade/exclude_renamed/stderr.log +++ b/tests/cargo-upgrade/exclude_renamed/stderr.log @@ -1,3 +1,2 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.log b/tests/cargo-upgrade/ignore_rust_version/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/ignore_rust_version/stderr.log +++ b/tests/cargo-upgrade/ignore_rust_version/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/implicit_prerelease/stderr.log +++ b/tests/cargo-upgrade/implicit_prerelease/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/invalid_dep/stderr.log b/tests/cargo-upgrade/invalid_dep/stderr.log index a905adf081..cdbc04aff8 100644 --- a/tests/cargo-upgrade/invalid_dep/stderr.log +++ b/tests/cargo-upgrade/invalid_dep/stderr.log @@ -1,3 +1,2 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Error: dependency failure doesn't exist diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.log b/tests/cargo-upgrade/invalid_manifest/stderr.log index 6eb2c57ea2..cc5355e613 100644 --- a/tests/cargo-upgrade/invalid_manifest/stderr.log +++ b/tests/cargo-upgrade/invalid_manifest/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` error: expected `.`, `=` diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log index 0af116d9b6..3e8f34ec56 100644 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log @@ -1,3 +1,2 @@ - Updating '[ROOTURL]/registry' index Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ... diff --git a/tests/cargo-upgrade/locked/stderr.log b/tests/cargo-upgrade/locked/stderr.log index 600436eb4f..aecfc3d339 100644 --- a/tests/cargo-upgrade/locked/stderr.log +++ b/tests/cargo-upgrade/locked/stderr.log @@ -1,3 +1,2 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/locked_dry_run/stderr.log b/tests/cargo-upgrade/locked_dry_run/stderr.log index 600436eb4f..aecfc3d339 100644 --- a/tests/cargo-upgrade/locked_dry_run/stderr.log +++ b/tests/cargo-upgrade/locked_dry_run/stderr.log @@ -1,3 +1,2 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/lockfile/stderr.log b/tests/cargo-upgrade/lockfile/stderr.log index 6c713e4ebf..1085f9ef99 100644 --- a/tests/cargo-upgrade/lockfile/stderr.log +++ b/tests/cargo-upgrade/lockfile/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/optional_dep/stderr.log +++ b/tests/cargo-upgrade/optional_dep/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/package_rust_version/stderr.log b/tests/cargo-upgrade/package_rust_version/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/package_rust_version/stderr.log +++ b/tests/cargo-upgrade/package_rust_version/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log index 7903eb2c84..8e6e2dcce0 100644 --- a/tests/cargo-upgrade/pinned/stderr.log +++ b/tests/cargo-upgrade/pinned/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/preserve_op/stderr.log b/tests/cargo-upgrade/preserve_op/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/preserve_op/stderr.log +++ b/tests/cargo-upgrade/preserve_op/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/preserve_precision_major/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_major/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/preserves_inline_table/stderr.log +++ b/tests/cargo-upgrade/preserves_inline_table/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/preserves_std_table/stderr.log +++ b/tests/cargo-upgrade/preserves_std_table/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/single_dep/stderr.log +++ b/tests/cargo-upgrade/single_dep/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/skip_compatible/stderr.log b/tests/cargo-upgrade/skip_compatible/stderr.log index 6a4cb8113d..68e70d213d 100644 --- a/tests/cargo-upgrade/skip_compatible/stderr.log +++ b/tests/cargo-upgrade/skip_compatible/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies note: Re-run with `--incompatible` to upgrade incompatible version requirements diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log index dbdaebdb1f..ce9696ae2f 100644 --- a/tests/cargo-upgrade/specified/stderr.log +++ b/tests/cargo-upgrade/specified/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/to_version/stderr.log b/tests/cargo-upgrade/to_version/stderr.log index 616ee1470f..b4cda1e371 100644 --- a/tests/cargo-upgrade/to_version/stderr.log +++ b/tests/cargo-upgrade/to_version/stderr.log @@ -1,2 +1 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log index 6c713e4ebf..1085f9ef99 100644 --- a/tests/cargo-upgrade/upgrade_all/stderr.log +++ b/tests/cargo-upgrade/upgrade_all/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log index c0d39316ed..796318abdf 100644 --- a/tests/cargo-upgrade/upgrade_everything/stderr.log +++ b/tests/cargo-upgrade/upgrade_everything/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking None's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log index 59c1bfdbf1..85e1821fc0 100644 --- a/tests/cargo-upgrade/upgrade_renamed/stderr.log +++ b/tests/cargo-upgrade/upgrade_renamed/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.log b/tests/cargo-upgrade/upgrade_verbose/stderr.log index 7ed0b2fc30..774ad6740f 100644 --- a/tests/cargo-upgrade/upgrade_verbose/stderr.log +++ b/tests/cargo-upgrade/upgrade_verbose/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking None's dependencies Upgrading recursive dependencies warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log index 6c713e4ebf..1085f9ef99 100644 --- a/tests/cargo-upgrade/upgrade_workspace/stderr.log +++ b/tests/cargo-upgrade/upgrade_workspace/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log index 6c713e4ebf..1085f9ef99 100644 --- a/tests/cargo-upgrade/virtual_manifest/stderr.log +++ b/tests/cargo-upgrade/virtual_manifest/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.log b/tests/cargo-upgrade/workspace_inheritance/stderr.log index 32a5001869..03abc410c3 100644 --- a/tests/cargo-upgrade/workspace_inheritance/stderr.log +++ b/tests/cargo-upgrade/workspace_inheritance/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log index 6aacb7898a..829a5b3842 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log +++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log index 6aacb7898a..829a5b3842 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log @@ -1,4 +1,3 @@ - Updating '[ROOTURL]/registry' index Checking virtual workspace's dependencies Checking four's dependencies Checking one's dependencies From 40c7c3aae71ce0c7824f33db12d173734ac7bd02 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 16:30:00 -0500 Subject: [PATCH 7/8] chore: Upgrade cargo-test-support --- .github/workflows/build.yml | 3 - Cargo.lock | 504 +++++++++++------- Cargo.toml | 6 +- .../cargo-set-version/downgrade_error/mod.rs | 11 +- .../downgrade_error/stderr.log | 1 - .../downgrade_error/stderr.term.svg | 25 + .../downgrade_error/stdout.log | 0 .../downgrade_error/stdout.term.svg | 21 + tests/cargo-set-version/dry_run/mod.rs | 11 +- tests/cargo-set-version/dry_run/stderr.log | 2 - .../cargo-set-version/dry_run/stderr.term.svg | 27 + tests/cargo-set-version/dry_run/stdout.log | 0 .../cargo-set-version/dry_run/stdout.term.svg | 21 + .../cargo-set-version/ignore_dependent/mod.rs | 11 +- .../ignore_dependent/stderr.log | 1 - .../ignore_dependent/stderr.term.svg | 25 + .../ignore_dependent/stdout.log | 0 .../ignore_dependent/stdout.term.svg | 21 + .../relative_absolute_conflict/mod.rs | 11 +- .../relative_absolute_conflict/stderr.log | 5 - .../stderr.term.svg | 33 ++ .../relative_absolute_conflict/stdout.log | 0 .../stdout.term.svg | 21 + .../set_absolute_version/mod.rs | 11 +- .../set_absolute_version/stderr.log | 1 - .../set_absolute_version/stderr.term.svg | 25 + .../set_absolute_version/stdout.log | 0 .../set_absolute_version/stdout.term.svg | 21 + .../set_absolute_workspace_version/mod.rs | 11 +- .../set_absolute_workspace_version/stderr.log | 4 - .../stderr.term.svg | 31 ++ .../set_absolute_workspace_version/stdout.log | 0 .../stdout.term.svg | 21 + .../set_relative_version/mod.rs | 11 +- .../set_relative_version/stderr.log | 1 - .../set_relative_version/stderr.term.svg | 25 + .../set_relative_version/stdout.log | 0 .../set_relative_version/stdout.term.svg | 21 + .../set_relative_workspace_version/mod.rs | 11 +- .../set_relative_workspace_version/stderr.log | 4 - .../stderr.term.svg | 31 ++ .../set_relative_workspace_version/stdout.log | 0 .../stdout.term.svg | 21 + .../upgrade_compatible_dependency/mod.rs | 11 +- .../upgrade_compatible_dependency/stderr.log | 2 - .../stderr.term.svg | 27 + .../upgrade_compatible_dependency/stdout.log | 0 .../stdout.term.svg | 21 + .../upgrade_incompatible_dependency/mod.rs | 11 +- .../stderr.log | 2 - .../stderr.term.svg | 27 + .../stdout.log | 0 .../stdout.term.svg | 21 + .../upgrade_workspace/mod.rs | 11 +- .../upgrade_workspace/stderr.log | 3 - .../upgrade_workspace/stderr.term.svg | 29 + .../upgrade_workspace/stdout.log | 0 .../upgrade_workspace/stdout.term.svg | 21 + .../virtual_workspace_deps/mod.rs | 11 +- .../virtual_workspace_deps/stderr.log | 3 - .../virtual_workspace_deps/stderr.term.svg | 29 + .../virtual_workspace_deps/stdout.log | 0 .../virtual_workspace_deps/stdout.term.svg | 21 + tests/cargo-set-version/workspace_deps/mod.rs | 11 +- .../workspace_deps/stderr.log | 3 - .../workspace_deps/stderr.term.svg | 29 + .../workspace_deps/stdout.log | 0 .../workspace_deps/stdout.term.svg | 21 + .../workspace_version_exclude/mod.rs | 11 +- .../workspace_version_exclude/stderr.log | 1 - .../workspace_version_exclude/stderr.term.svg | 25 + .../workspace_version_exclude/stdout.log | 0 .../workspace_version_exclude/stdout.term.svg | 21 + .../workspace_version_subset/mod.rs | 11 +- .../workspace_version_subset/stderr.log | 4 - .../workspace_version_subset/stderr.term.svg | 31 ++ .../workspace_version_subset/stdout.log | 0 .../workspace_version_subset/stdout.term.svg | 21 + tests/cargo-upgrade/alt_registry/mod.rs | 11 +- tests/cargo-upgrade/alt_registry/stderr.log | 5 - .../alt_registry/stderr.term.svg | 29 + tests/cargo-upgrade/alt_registry/stdout.log | 4 - .../alt_registry/stdout.term.svg | 31 ++ tests/cargo-upgrade/cli_rust_version/mod.rs | 11 +- .../cargo-upgrade/cli_rust_version/stderr.log | 5 - .../cli_rust_version/stderr.term.svg | 29 + .../cargo-upgrade/cli_rust_version/stdout.log | 3 - .../cli_rust_version/stdout.term.svg | 29 + tests/cargo-upgrade/dry_run/mod.rs | 11 +- tests/cargo-upgrade/dry_run/stderr.log | 2 - tests/cargo-upgrade/dry_run/stderr.term.svg | 27 + tests/cargo-upgrade/dry_run/stdout.log | 3 - tests/cargo-upgrade/dry_run/stdout.term.svg | 29 + tests/cargo-upgrade/exclude_dep/mod.rs | 11 +- tests/cargo-upgrade/exclude_dep/stderr.log | 5 - .../cargo-upgrade/exclude_dep/stderr.term.svg | 29 + tests/cargo-upgrade/exclude_dep/stdout.log | 18 - .../cargo-upgrade/exclude_dep/stdout.term.svg | 59 ++ tests/cargo-upgrade/exclude_renamed/mod.rs | 11 +- .../cargo-upgrade/exclude_renamed/stderr.log | 2 - .../exclude_renamed/stderr.term.svg | 27 + .../cargo-upgrade/exclude_renamed/stdout.log | 4 - .../exclude_renamed/stdout.term.svg | 31 ++ .../cargo-upgrade/ignore_rust_version/mod.rs | 11 +- .../ignore_rust_version/stderr.log | 5 - .../ignore_rust_version/stderr.term.svg | 29 + .../ignore_rust_version/stdout.log | 3 - .../ignore_rust_version/stdout.term.svg | 29 + .../cargo-upgrade/implicit_prerelease/mod.rs | 11 +- .../implicit_prerelease/stderr.log | 5 - .../implicit_prerelease/stderr.term.svg | 29 + .../implicit_prerelease/stdout.log | 4 - .../implicit_prerelease/stdout.term.svg | 31 ++ tests/cargo-upgrade/invalid_dep/mod.rs | 11 +- tests/cargo-upgrade/invalid_dep/stderr.log | 2 - .../cargo-upgrade/invalid_dep/stderr.term.svg | 27 + tests/cargo-upgrade/invalid_dep/stdout.log | 0 .../cargo-upgrade/invalid_dep/stdout.term.svg | 21 + tests/cargo-upgrade/invalid_flag/mod.rs | 11 +- tests/cargo-upgrade/invalid_flag/stderr.log | 5 - .../invalid_flag/stderr.term.svg | 33 ++ tests/cargo-upgrade/invalid_flag/stdout.log | 0 .../invalid_flag/stdout.term.svg | 21 + tests/cargo-upgrade/invalid_manifest/mod.rs | 11 +- .../cargo-upgrade/invalid_manifest/stderr.log | 9 - .../invalid_manifest/stderr.term.svg | 37 ++ .../cargo-upgrade/invalid_manifest/stdout.log | 0 .../invalid_manifest/stdout.term.svg | 21 + .../invalid_workspace_root_manifest/mod.rs | 11 +- .../stderr.log | 2 - .../stderr.term.svg | 37 ++ .../stdout.log | 0 .../stdout.term.svg | 21 + tests/cargo-upgrade/locked/mod.rs | 11 +- tests/cargo-upgrade/locked/stderr.log | 2 - tests/cargo-upgrade/locked/stderr.term.svg | 27 + tests/cargo-upgrade/locked/stdout.log | 3 - tests/cargo-upgrade/locked/stdout.term.svg | 29 + tests/cargo-upgrade/locked_dry_run/mod.rs | 11 +- tests/cargo-upgrade/locked_dry_run/stderr.log | 2 - .../locked_dry_run/stderr.term.svg | 27 + tests/cargo-upgrade/locked_dry_run/stdout.log | 3 - .../locked_dry_run/stdout.term.svg | 29 + tests/cargo-upgrade/lockfile/mod.rs | 11 +- tests/cargo-upgrade/lockfile/out/Cargo.lock | 2 +- tests/cargo-upgrade/lockfile/stderr.log | 9 - tests/cargo-upgrade/lockfile/stderr.term.svg | 37 ++ tests/cargo-upgrade/lockfile/stdout.log | 13 - tests/cargo-upgrade/lockfile/stdout.term.svg | 49 ++ tests/cargo-upgrade/optional_dep/mod.rs | 11 +- tests/cargo-upgrade/optional_dep/stderr.log | 5 - .../optional_dep/stderr.term.svg | 29 + tests/cargo-upgrade/optional_dep/stdout.log | 3 - .../optional_dep/stdout.term.svg | 29 + .../cargo-upgrade/package_rust_version/mod.rs | 11 +- .../package_rust_version/stderr.log | 5 - .../package_rust_version/stderr.term.svg | 29 + .../package_rust_version/stdout.log | 3 - .../package_rust_version/stdout.term.svg | 29 + tests/cargo-upgrade/pinned/mod.rs | 11 +- tests/cargo-upgrade/pinned/stderr.log | 6 - tests/cargo-upgrade/pinned/stderr.term.svg | 31 ++ tests/cargo-upgrade/pinned/stdout.log | 11 - tests/cargo-upgrade/pinned/stdout.term.svg | 45 ++ tests/cargo-upgrade/preserve_op/mod.rs | 11 +- tests/cargo-upgrade/preserve_op/stderr.log | 5 - .../cargo-upgrade/preserve_op/stderr.term.svg | 29 + tests/cargo-upgrade/preserve_op/stdout.log | 11 - .../cargo-upgrade/preserve_op/stdout.term.svg | 45 ++ .../preserve_precision_major/mod.rs | 11 +- .../preserve_precision_major/stderr.log | 5 - .../preserve_precision_major/stderr.term.svg | 29 + .../preserve_precision_major/stdout.log | 3 - .../preserve_precision_major/stdout.term.svg | 29 + .../preserve_precision_minor/mod.rs | 11 +- .../preserve_precision_minor/stderr.log | 5 - .../preserve_precision_minor/stderr.term.svg | 29 + .../preserve_precision_minor/stdout.log | 3 - .../preserve_precision_minor/stdout.term.svg | 29 + .../preserve_precision_patch/mod.rs | 11 +- .../preserve_precision_patch/stderr.log | 5 - .../preserve_precision_patch/stderr.term.svg | 29 + .../preserve_precision_patch/stdout.log | 3 - .../preserve_precision_patch/stdout.term.svg | 29 + .../preserves_inline_table/mod.rs | 11 +- .../preserves_inline_table/stderr.log | 5 - .../preserves_inline_table/stderr.term.svg | 29 + .../preserves_inline_table/stdout.log | 3 - .../preserves_inline_table/stdout.term.svg | 29 + .../cargo-upgrade/preserves_std_table/mod.rs | 11 +- .../preserves_std_table/stderr.log | 5 - .../preserves_std_table/stderr.term.svg | 29 + .../preserves_std_table/stdout.log | 3 - .../preserves_std_table/stdout.term.svg | 29 + tests/cargo-upgrade/single_dep/mod.rs | 11 +- tests/cargo-upgrade/single_dep/stderr.log | 5 - .../cargo-upgrade/single_dep/stderr.term.svg | 29 + tests/cargo-upgrade/single_dep/stdout.log | 3 - .../cargo-upgrade/single_dep/stdout.term.svg | 29 + tests/cargo-upgrade/skip_compatible/mod.rs | 11 +- .../cargo-upgrade/skip_compatible/stderr.log | 3 - .../skip_compatible/stderr.term.svg | 29 + .../cargo-upgrade/skip_compatible/stdout.log | 4 - .../skip_compatible/stdout.term.svg | 31 ++ tests/cargo-upgrade/specified/mod.rs | 11 +- tests/cargo-upgrade/specified/stderr.log | 7 - tests/cargo-upgrade/specified/stderr.term.svg | 33 ++ tests/cargo-upgrade/specified/stdout.log | 3 - tests/cargo-upgrade/specified/stdout.term.svg | 29 + tests/cargo-upgrade/to_version/mod.rs | 11 +- tests/cargo-upgrade/to_version/stderr.log | 1 - .../cargo-upgrade/to_version/stderr.term.svg | 25 + tests/cargo-upgrade/to_version/stdout.log | 3 - .../cargo-upgrade/to_version/stdout.term.svg | 29 + tests/cargo-upgrade/upgrade_all/mod.rs | 11 +- .../cargo-upgrade/upgrade_all/out/Cargo.lock | 2 +- tests/cargo-upgrade/upgrade_all/stderr.log | 9 - .../cargo-upgrade/upgrade_all/stderr.term.svg | 37 ++ tests/cargo-upgrade/upgrade_all/stdout.log | 13 - .../cargo-upgrade/upgrade_all/stdout.term.svg | 49 ++ tests/cargo-upgrade/upgrade_everything/mod.rs | 11 +- .../upgrade_everything/stderr.log | 7 - .../upgrade_everything/stderr.term.svg | 33 ++ .../upgrade_everything/stdout.log | 17 - .../upgrade_everything/stdout.term.svg | 57 ++ tests/cargo-upgrade/upgrade_renamed/mod.rs | 11 +- .../cargo-upgrade/upgrade_renamed/stderr.log | 5 - .../upgrade_renamed/stderr.term.svg | 29 + .../cargo-upgrade/upgrade_renamed/stdout.log | 4 - .../upgrade_renamed/stdout.term.svg | 31 ++ tests/cargo-upgrade/upgrade_verbose/mod.rs | 11 +- .../cargo-upgrade/upgrade_verbose/stderr.log | 5 - .../upgrade_verbose/stderr.term.svg | 29 + .../cargo-upgrade/upgrade_verbose/stdout.log | 18 - .../upgrade_verbose/stdout.term.svg | 59 ++ tests/cargo-upgrade/upgrade_workspace/mod.rs | 11 +- .../upgrade_workspace/out/Cargo.lock | 2 +- .../upgrade_workspace/stderr.log | 9 - .../upgrade_workspace/stderr.term.svg | 37 ++ .../upgrade_workspace/stdout.log | 13 - .../upgrade_workspace/stdout.term.svg | 49 ++ tests/cargo-upgrade/virtual_manifest/mod.rs | 11 +- .../virtual_manifest/out/Cargo.lock | 2 +- .../cargo-upgrade/virtual_manifest/stderr.log | 9 - .../virtual_manifest/stderr.term.svg | 37 ++ .../cargo-upgrade/virtual_manifest/stdout.log | 13 - .../virtual_manifest/stdout.term.svg | 49 ++ .../workspace_inheritance/mod.rs | 11 +- .../workspace_inheritance/out/Cargo.lock | 2 +- .../workspace_inheritance/stderr.log | 11 - .../workspace_inheritance/stderr.term.svg | 41 ++ .../workspace_inheritance/stdout.log | 3 - .../workspace_inheritance/stdout.term.svg | 29 + .../cargo-upgrade/workspace_member_cwd/mod.rs | 11 +- .../workspace_member_cwd/out/Cargo.lock | 2 +- .../workspace_member_cwd/stderr.log | 11 - .../workspace_member_cwd/stderr.term.svg | 41 ++ .../workspace_member_cwd/stdout.log | 12 - .../workspace_member_cwd/stdout.term.svg | 47 ++ .../workspace_member_manifest_path/mod.rs | 11 +- .../workspace_member_manifest_path/stderr.log | 11 - .../stderr.term.svg | 41 ++ .../workspace_member_manifest_path/stdout.log | 12 - .../stdout.term.svg | 47 ++ 264 files changed, 3735 insertions(+), 926 deletions(-) delete mode 100644 tests/cargo-set-version/downgrade_error/stderr.log create mode 100644 tests/cargo-set-version/downgrade_error/stderr.term.svg delete mode 100644 tests/cargo-set-version/downgrade_error/stdout.log create mode 100644 tests/cargo-set-version/downgrade_error/stdout.term.svg delete mode 100644 tests/cargo-set-version/dry_run/stderr.log create mode 100644 tests/cargo-set-version/dry_run/stderr.term.svg delete mode 100644 tests/cargo-set-version/dry_run/stdout.log create mode 100644 tests/cargo-set-version/dry_run/stdout.term.svg delete mode 100644 tests/cargo-set-version/ignore_dependent/stderr.log create mode 100644 tests/cargo-set-version/ignore_dependent/stderr.term.svg delete mode 100644 tests/cargo-set-version/ignore_dependent/stdout.log create mode 100644 tests/cargo-set-version/ignore_dependent/stdout.term.svg delete mode 100644 tests/cargo-set-version/relative_absolute_conflict/stderr.log create mode 100644 tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg delete mode 100644 tests/cargo-set-version/relative_absolute_conflict/stdout.log create mode 100644 tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg delete mode 100644 tests/cargo-set-version/set_absolute_version/stderr.log create mode 100644 tests/cargo-set-version/set_absolute_version/stderr.term.svg delete mode 100644 tests/cargo-set-version/set_absolute_version/stdout.log create mode 100644 tests/cargo-set-version/set_absolute_version/stdout.term.svg delete mode 100644 tests/cargo-set-version/set_absolute_workspace_version/stderr.log create mode 100644 tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg delete mode 100644 tests/cargo-set-version/set_absolute_workspace_version/stdout.log create mode 100644 tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg delete mode 100644 tests/cargo-set-version/set_relative_version/stderr.log create mode 100644 tests/cargo-set-version/set_relative_version/stderr.term.svg delete mode 100644 tests/cargo-set-version/set_relative_version/stdout.log create mode 100644 tests/cargo-set-version/set_relative_version/stdout.term.svg delete mode 100644 tests/cargo-set-version/set_relative_workspace_version/stderr.log create mode 100644 tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg delete mode 100644 tests/cargo-set-version/set_relative_workspace_version/stdout.log create mode 100644 tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg delete mode 100644 tests/cargo-set-version/upgrade_compatible_dependency/stderr.log create mode 100644 tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg delete mode 100644 tests/cargo-set-version/upgrade_compatible_dependency/stdout.log create mode 100644 tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg delete mode 100644 tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log create mode 100644 tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg delete mode 100644 tests/cargo-set-version/upgrade_incompatible_dependency/stdout.log create mode 100644 tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg delete mode 100644 tests/cargo-set-version/upgrade_workspace/stderr.log create mode 100644 tests/cargo-set-version/upgrade_workspace/stderr.term.svg delete mode 100644 tests/cargo-set-version/upgrade_workspace/stdout.log create mode 100644 tests/cargo-set-version/upgrade_workspace/stdout.term.svg delete mode 100644 tests/cargo-set-version/virtual_workspace_deps/stderr.log create mode 100644 tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg delete mode 100644 tests/cargo-set-version/virtual_workspace_deps/stdout.log create mode 100644 tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg delete mode 100644 tests/cargo-set-version/workspace_deps/stderr.log create mode 100644 tests/cargo-set-version/workspace_deps/stderr.term.svg delete mode 100644 tests/cargo-set-version/workspace_deps/stdout.log create mode 100644 tests/cargo-set-version/workspace_deps/stdout.term.svg delete mode 100644 tests/cargo-set-version/workspace_version_exclude/stderr.log create mode 100644 tests/cargo-set-version/workspace_version_exclude/stderr.term.svg delete mode 100644 tests/cargo-set-version/workspace_version_exclude/stdout.log create mode 100644 tests/cargo-set-version/workspace_version_exclude/stdout.term.svg delete mode 100644 tests/cargo-set-version/workspace_version_subset/stderr.log create mode 100644 tests/cargo-set-version/workspace_version_subset/stderr.term.svg delete mode 100644 tests/cargo-set-version/workspace_version_subset/stdout.log create mode 100644 tests/cargo-set-version/workspace_version_subset/stdout.term.svg delete mode 100644 tests/cargo-upgrade/alt_registry/stderr.log create mode 100644 tests/cargo-upgrade/alt_registry/stderr.term.svg delete mode 100644 tests/cargo-upgrade/alt_registry/stdout.log create mode 100644 tests/cargo-upgrade/alt_registry/stdout.term.svg delete mode 100644 tests/cargo-upgrade/cli_rust_version/stderr.log create mode 100644 tests/cargo-upgrade/cli_rust_version/stderr.term.svg delete mode 100644 tests/cargo-upgrade/cli_rust_version/stdout.log create mode 100644 tests/cargo-upgrade/cli_rust_version/stdout.term.svg delete mode 100644 tests/cargo-upgrade/dry_run/stderr.log create mode 100644 tests/cargo-upgrade/dry_run/stderr.term.svg delete mode 100644 tests/cargo-upgrade/dry_run/stdout.log create mode 100644 tests/cargo-upgrade/dry_run/stdout.term.svg delete mode 100644 tests/cargo-upgrade/exclude_dep/stderr.log create mode 100644 tests/cargo-upgrade/exclude_dep/stderr.term.svg delete mode 100644 tests/cargo-upgrade/exclude_dep/stdout.log create mode 100644 tests/cargo-upgrade/exclude_dep/stdout.term.svg delete mode 100644 tests/cargo-upgrade/exclude_renamed/stderr.log create mode 100644 tests/cargo-upgrade/exclude_renamed/stderr.term.svg delete mode 100644 tests/cargo-upgrade/exclude_renamed/stdout.log create mode 100644 tests/cargo-upgrade/exclude_renamed/stdout.term.svg delete mode 100644 tests/cargo-upgrade/ignore_rust_version/stderr.log create mode 100644 tests/cargo-upgrade/ignore_rust_version/stderr.term.svg delete mode 100644 tests/cargo-upgrade/ignore_rust_version/stdout.log create mode 100644 tests/cargo-upgrade/ignore_rust_version/stdout.term.svg delete mode 100644 tests/cargo-upgrade/implicit_prerelease/stderr.log create mode 100644 tests/cargo-upgrade/implicit_prerelease/stderr.term.svg delete mode 100644 tests/cargo-upgrade/implicit_prerelease/stdout.log create mode 100644 tests/cargo-upgrade/implicit_prerelease/stdout.term.svg delete mode 100644 tests/cargo-upgrade/invalid_dep/stderr.log create mode 100644 tests/cargo-upgrade/invalid_dep/stderr.term.svg delete mode 100644 tests/cargo-upgrade/invalid_dep/stdout.log create mode 100644 tests/cargo-upgrade/invalid_dep/stdout.term.svg delete mode 100644 tests/cargo-upgrade/invalid_flag/stderr.log create mode 100644 tests/cargo-upgrade/invalid_flag/stderr.term.svg delete mode 100644 tests/cargo-upgrade/invalid_flag/stdout.log create mode 100644 tests/cargo-upgrade/invalid_flag/stdout.term.svg delete mode 100644 tests/cargo-upgrade/invalid_manifest/stderr.log create mode 100644 tests/cargo-upgrade/invalid_manifest/stderr.term.svg delete mode 100644 tests/cargo-upgrade/invalid_manifest/stdout.log create mode 100644 tests/cargo-upgrade/invalid_manifest/stdout.term.svg delete mode 100644 tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log create mode 100644 tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg delete mode 100644 tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.log create mode 100644 tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg delete mode 100644 tests/cargo-upgrade/locked/stderr.log create mode 100644 tests/cargo-upgrade/locked/stderr.term.svg delete mode 100644 tests/cargo-upgrade/locked/stdout.log create mode 100644 tests/cargo-upgrade/locked/stdout.term.svg delete mode 100644 tests/cargo-upgrade/locked_dry_run/stderr.log create mode 100644 tests/cargo-upgrade/locked_dry_run/stderr.term.svg delete mode 100644 tests/cargo-upgrade/locked_dry_run/stdout.log create mode 100644 tests/cargo-upgrade/locked_dry_run/stdout.term.svg delete mode 100644 tests/cargo-upgrade/lockfile/stderr.log create mode 100644 tests/cargo-upgrade/lockfile/stderr.term.svg delete mode 100644 tests/cargo-upgrade/lockfile/stdout.log create mode 100644 tests/cargo-upgrade/lockfile/stdout.term.svg delete mode 100644 tests/cargo-upgrade/optional_dep/stderr.log create mode 100644 tests/cargo-upgrade/optional_dep/stderr.term.svg delete mode 100644 tests/cargo-upgrade/optional_dep/stdout.log create mode 100644 tests/cargo-upgrade/optional_dep/stdout.term.svg delete mode 100644 tests/cargo-upgrade/package_rust_version/stderr.log create mode 100644 tests/cargo-upgrade/package_rust_version/stderr.term.svg delete mode 100644 tests/cargo-upgrade/package_rust_version/stdout.log create mode 100644 tests/cargo-upgrade/package_rust_version/stdout.term.svg delete mode 100644 tests/cargo-upgrade/pinned/stderr.log create mode 100644 tests/cargo-upgrade/pinned/stderr.term.svg delete mode 100644 tests/cargo-upgrade/pinned/stdout.log create mode 100644 tests/cargo-upgrade/pinned/stdout.term.svg delete mode 100644 tests/cargo-upgrade/preserve_op/stderr.log create mode 100644 tests/cargo-upgrade/preserve_op/stderr.term.svg delete mode 100644 tests/cargo-upgrade/preserve_op/stdout.log create mode 100644 tests/cargo-upgrade/preserve_op/stdout.term.svg delete mode 100644 tests/cargo-upgrade/preserve_precision_major/stderr.log create mode 100644 tests/cargo-upgrade/preserve_precision_major/stderr.term.svg delete mode 100644 tests/cargo-upgrade/preserve_precision_major/stdout.log create mode 100644 tests/cargo-upgrade/preserve_precision_major/stdout.term.svg delete mode 100644 tests/cargo-upgrade/preserve_precision_minor/stderr.log create mode 100644 tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg delete mode 100644 tests/cargo-upgrade/preserve_precision_minor/stdout.log create mode 100644 tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg delete mode 100644 tests/cargo-upgrade/preserve_precision_patch/stderr.log create mode 100644 tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg delete mode 100644 tests/cargo-upgrade/preserve_precision_patch/stdout.log create mode 100644 tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg delete mode 100644 tests/cargo-upgrade/preserves_inline_table/stderr.log create mode 100644 tests/cargo-upgrade/preserves_inline_table/stderr.term.svg delete mode 100644 tests/cargo-upgrade/preserves_inline_table/stdout.log create mode 100644 tests/cargo-upgrade/preserves_inline_table/stdout.term.svg delete mode 100644 tests/cargo-upgrade/preserves_std_table/stderr.log create mode 100644 tests/cargo-upgrade/preserves_std_table/stderr.term.svg delete mode 100644 tests/cargo-upgrade/preserves_std_table/stdout.log create mode 100644 tests/cargo-upgrade/preserves_std_table/stdout.term.svg delete mode 100644 tests/cargo-upgrade/single_dep/stderr.log create mode 100644 tests/cargo-upgrade/single_dep/stderr.term.svg delete mode 100644 tests/cargo-upgrade/single_dep/stdout.log create mode 100644 tests/cargo-upgrade/single_dep/stdout.term.svg delete mode 100644 tests/cargo-upgrade/skip_compatible/stderr.log create mode 100644 tests/cargo-upgrade/skip_compatible/stderr.term.svg delete mode 100644 tests/cargo-upgrade/skip_compatible/stdout.log create mode 100644 tests/cargo-upgrade/skip_compatible/stdout.term.svg delete mode 100644 tests/cargo-upgrade/specified/stderr.log create mode 100644 tests/cargo-upgrade/specified/stderr.term.svg delete mode 100644 tests/cargo-upgrade/specified/stdout.log create mode 100644 tests/cargo-upgrade/specified/stdout.term.svg delete mode 100644 tests/cargo-upgrade/to_version/stderr.log create mode 100644 tests/cargo-upgrade/to_version/stderr.term.svg delete mode 100644 tests/cargo-upgrade/to_version/stdout.log create mode 100644 tests/cargo-upgrade/to_version/stdout.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_all/stderr.log create mode 100644 tests/cargo-upgrade/upgrade_all/stderr.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_all/stdout.log create mode 100644 tests/cargo-upgrade/upgrade_all/stdout.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_everything/stderr.log create mode 100644 tests/cargo-upgrade/upgrade_everything/stderr.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_everything/stdout.log create mode 100644 tests/cargo-upgrade/upgrade_everything/stdout.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_renamed/stderr.log create mode 100644 tests/cargo-upgrade/upgrade_renamed/stderr.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_renamed/stdout.log create mode 100644 tests/cargo-upgrade/upgrade_renamed/stdout.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_verbose/stderr.log create mode 100644 tests/cargo-upgrade/upgrade_verbose/stderr.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_verbose/stdout.log create mode 100644 tests/cargo-upgrade/upgrade_verbose/stdout.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_workspace/stderr.log create mode 100644 tests/cargo-upgrade/upgrade_workspace/stderr.term.svg delete mode 100644 tests/cargo-upgrade/upgrade_workspace/stdout.log create mode 100644 tests/cargo-upgrade/upgrade_workspace/stdout.term.svg delete mode 100644 tests/cargo-upgrade/virtual_manifest/stderr.log create mode 100644 tests/cargo-upgrade/virtual_manifest/stderr.term.svg delete mode 100644 tests/cargo-upgrade/virtual_manifest/stdout.log create mode 100644 tests/cargo-upgrade/virtual_manifest/stdout.term.svg delete mode 100644 tests/cargo-upgrade/workspace_inheritance/stderr.log create mode 100644 tests/cargo-upgrade/workspace_inheritance/stderr.term.svg delete mode 100644 tests/cargo-upgrade/workspace_inheritance/stdout.log create mode 100644 tests/cargo-upgrade/workspace_inheritance/stdout.term.svg delete mode 100644 tests/cargo-upgrade/workspace_member_cwd/stderr.log create mode 100644 tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg delete mode 100644 tests/cargo-upgrade/workspace_member_cwd/stdout.log create mode 100644 tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg delete mode 100644 tests/cargo-upgrade/workspace_member_manifest_path/stderr.log create mode 100644 tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg delete mode 100644 tests/cargo-upgrade/workspace_member_manifest_path/stdout.log create mode 100644 tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faefc68260..e09acf951b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,6 @@ jobs: - name: Run tests run: cargo test --verbose continue-on-error: ${{ matrix.toolchain != 'stable' }} - - name: Run tests (vendored-openssl) - run: cargo test --features vendored-openssl --verbose - continue-on-error: ${{ matrix.toolchain != 'stable' }} clippy: name: clippy (ubuntu-latest, stable) diff --git a/Cargo.lock b/Cargo.lock index 0a3d221f51..0c73b5398f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,12 +11,6 @@ dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -25,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -61,11 +55,35 @@ dependencies = [ "utf8parse", ] +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 3.0.4", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-lossy" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f45c79b3b9413932fc255f2c19ca0d48eaab72c4ea1913bafaebf289cbc099f2" +dependencies = [ + "anstyle", +] [[package]] name = "anstyle-parse" @@ -85,6 +103,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "anstyle-svg" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962f6d5681926dbe5503b71057202d6723a33abe464c983b1d160bca3095a3bb" +dependencies = [ + "anstream 0.6.15", + "anstyle", + "anstyle-lossy", + "html-escape", + "unicode-width", +] + [[package]] name = "anstyle-wincon" version = "1.0.2" @@ -105,11 +136,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "assert_cmd" @@ -188,7 +229,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -235,9 +276,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata", @@ -296,12 +337,12 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "snapbox", + "snapbox 0.6.17", "subprocess", "tame-index", "termcolor", - "toml", - "toml_edit", + "toml 0.7.6", + "toml_edit 0.19.14", "trycmd", "url", ] @@ -317,14 +358,18 @@ dependencies = [ [[package]] name = "cargo-test-macro" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c6cbe0807294ca78d811d1e4995ddb6516c6c763c7a03493c4ba02b9e09215" [[package]] name = "cargo-test-support" -version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a816b64664799fb248c06ca28b989ee22ef6d9f83c0495e28954a56d4e9a27ba" dependencies = [ + "anstream 0.6.15", + "anstyle", "anyhow", "cargo-test-macro", "cargo-util", @@ -333,29 +378,31 @@ dependencies = [ "flate2", "git2", "glob", - "itertools", - "lazy_static", + "itertools 0.13.0", "pasetors", + "regex", "serde", "serde_json", - "snapbox", + "snapbox 0.6.17", "tar", - "termcolor", "time", - "toml", + "toml 0.8.19", "url", - "windows-sys 0.48.0", + "walkdir", + "windows-sys 0.52.0", ] [[package]] name = "cargo-util" -version = "0.2.7" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" dependencies = [ "anyhow", "core-foundation", "filetime", "hex", + "ignore", "jobserver", "libc", "miow", @@ -365,7 +412,7 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -384,9 +431,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" dependencies = [ "jobserver", "libc", @@ -489,9 +536,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -499,9 +546,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -514,8 +561,9 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.39.0" -source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" +version = "0.40.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f4884a8a380811c8ef088e7caeb68caeb665ffdb91f7276069e3c7828f168a" dependencies = [ "curl", "percent-encoding", @@ -607,24 +655,24 @@ checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.9", - "winapi", + "socket2", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.65+curl-8.2.1" +version = "0.4.75+curl-8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" +checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" dependencies = [ "cc", "libc", @@ -632,7 +680,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -754,30 +802,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -797,25 +834,25 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.48.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -835,9 +872,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -924,11 +961,11 @@ checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "git2" -version = "0.17.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "libc", "libgit2-sys", "log", @@ -945,15 +982,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1063,6 +1100,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + [[package]] name = "http" version = "1.1.0" @@ -1171,7 +1217,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower", "tower-service", @@ -1180,9 +1226,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1190,17 +1236,16 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -1249,10 +1294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.9", - "rustix 0.38.9", + "rustix 0.38.37", "windows-sys 0.48.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -1262,6 +1313,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1270,9 +1330,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1286,12 +1346,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" version = "0.2.158" @@ -1300,9 +1354,9 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -1312,6 +1366,17 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.4.0", + "libc", + "redox_syscall", +] + [[package]] name = "libssh2-sys" version = "0.3.0" @@ -1328,9 +1393,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -1346,9 +1411,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" @@ -1358,9 +1423,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1377,15 +1442,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -1515,9 +1571,9 @@ dependencies = [ [[package]] name = "pasetors" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" +checksum = "6b36d47c66f2230dd1b7143d9afb2b4891879020210eddf2ccb624e529b96dba" dependencies = [ "ct-codecs", "ed25519-compact", @@ -1551,9 +1607,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -1627,7 +1683,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1660,9 +1716,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1679,7 +1735,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.7", + "socket2", "thiserror", "tokio", "tracing", @@ -1710,16 +1766,16 @@ checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", - "socket2 0.5.7", + "socket2", "tracing", "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1778,18 +1834,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -1799,9 +1855,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -1810,9 +1866,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -1914,15 +1970,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", ] [[package]] @@ -2070,18 +2126,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2090,20 +2146,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2122,9 +2179,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2206,22 +2263,38 @@ dependencies = [ ] [[package]] -name = "snapbox-macros" -version = "0.3.5" +name = "snapbox" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" +checksum = "840b73eb3148bc3cbc10ebe00ec9bc6d96033e658d022c4adcbf3f35596fd64a" dependencies = [ - "anstream 0.5.0", + "anstream 0.6.15", + "anstyle", + "anstyle-svg", + "content_inspector", + "dunce", + "filetime", + "libc", + "normalize-line-endings", + "os_pipe", + "regex", + "serde", + "serde_json", + "similar", + "snapbox-macros", + "tempfile", + "wait-timeout", + "walkdir", + "windows-sys 0.59.0", ] [[package]] -name = "socket2" -version = "0.4.9" +name = "snapbox-macros" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "16569f53ca23a41bb6f62e0a5084aa1661f4814a67fa33696a79073e03a664af" dependencies = [ - "libc", - "winapi", + "anstream 0.6.15", ] [[package]] @@ -2280,9 +2353,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.32" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -2336,15 +2409,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", - "rustix 0.38.9", - "windows-sys 0.48.0", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -2374,34 +2447,24 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "time" version = "0.3.36" @@ -2459,7 +2522,7 @@ dependencies = [ "libc", "mio", "pin-project-lite", - "socket2 0.5.7", + "socket2", "windows-sys 0.52.0", ] @@ -2496,7 +2559,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", ] [[package]] @@ -2510,9 +2585,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -2527,7 +2602,20 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.15", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", ] [[package]] @@ -2559,32 +2647,19 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -2607,8 +2682,8 @@ dependencies = [ "rayon", "serde", "shlex", - "snapbox", - "toml_edit", + "snapbox 0.4.12", + "toml_edit 0.19.14", ] [[package]] @@ -2648,6 +2723,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + [[package]] name = "untrusted" version = "0.9.0" @@ -2656,15 +2737,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" version = "0.2.1" @@ -2694,9 +2781,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3020,6 +3107,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/Cargo.toml b/Cargo.toml index 7676b23371..75b53f9900 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,9 +92,9 @@ predicates = { version = "3.0.3", features = ["color"] } assert_cmd = { version = "2.0.12", features = ["color-auto"] } assert_fs = { version = "1.0.13", features = ["color-auto"] } trycmd = "0.14.17" -snapbox = { version = "0.4.12", features = ["cmd", "path"] } -cargo-test-macro.git = "https://github.com/rust-lang/cargo" -cargo-test-support.git = "https://github.com/rust-lang/cargo" +snapbox = { version = "0.6.9", features = ["cmd", "path"] } +cargo-test-macro = "0.3" +cargo-test-support = "0.3" url = "2.4.0" [features] diff --git a/tests/cargo-set-version/downgrade_error/mod.rs b/tests/cargo-set-version/downgrade_error/mod.rs index bf1de96ac0..a71fc90b78 100644 --- a/tests/cargo-set-version/downgrade_error/mod.rs +++ b/tests/cargo-set-version/downgrade_error/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/downgrade_error/stderr.log b/tests/cargo-set-version/downgrade_error/stderr.log deleted file mode 100644 index 1d96187d24..0000000000 --- a/tests/cargo-set-version/downgrade_error/stderr.log +++ /dev/null @@ -1 +0,0 @@ -Error: Cannot downgrade from 0.1.0 to 0.0.1 diff --git a/tests/cargo-set-version/downgrade_error/stderr.term.svg b/tests/cargo-set-version/downgrade_error/stderr.term.svg new file mode 100644 index 0000000000..3921c01580 --- /dev/null +++ b/tests/cargo-set-version/downgrade_error/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Error: Cannot downgrade from 0.1.0 to 0.0.1 + + + + + + diff --git a/tests/cargo-set-version/downgrade_error/stdout.log b/tests/cargo-set-version/downgrade_error/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/downgrade_error/stdout.term.svg b/tests/cargo-set-version/downgrade_error/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/downgrade_error/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/dry_run/mod.rs b/tests/cargo-set-version/dry_run/mod.rs index ed4fe2de26..dd024bac26 100644 --- a/tests/cargo-set-version/dry_run/mod.rs +++ b/tests/cargo-set-version/dry_run/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/dry_run/stderr.log b/tests/cargo-set-version/dry_run/stderr.log deleted file mode 100644 index 6126757f06..0000000000 --- a/tests/cargo-set-version/dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Upgrading sample from 0.1.0 to 2.0.0 -warning: aborting set-version due to dry run diff --git a/tests/cargo-set-version/dry_run/stderr.term.svg b/tests/cargo-set-version/dry_run/stderr.term.svg new file mode 100644 index 0000000000..cf7121a2d1 --- /dev/null +++ b/tests/cargo-set-version/dry_run/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Upgrading sample from 0.1.0 to 2.0.0 + + warning: aborting set-version due to dry run + + + + + + diff --git a/tests/cargo-set-version/dry_run/stdout.log b/tests/cargo-set-version/dry_run/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/dry_run/stdout.term.svg b/tests/cargo-set-version/dry_run/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/dry_run/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/ignore_dependent/mod.rs b/tests/cargo-set-version/ignore_dependent/mod.rs index 3453d990b6..e2797416d2 100644 --- a/tests/cargo-set-version/ignore_dependent/mod.rs +++ b/tests/cargo-set-version/ignore_dependent/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/ignore_dependent/stderr.log b/tests/cargo-set-version/ignore_dependent/stderr.log deleted file mode 100644 index a75c93de09..0000000000 --- a/tests/cargo-set-version/ignore_dependent/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 diff --git a/tests/cargo-set-version/ignore_dependent/stderr.term.svg b/tests/cargo-set-version/ignore_dependent/stderr.term.svg new file mode 100644 index 0000000000..02e89599cd --- /dev/null +++ b/tests/cargo-set-version/ignore_dependent/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/ignore_dependent/stdout.log b/tests/cargo-set-version/ignore_dependent/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/ignore_dependent/stdout.term.svg b/tests/cargo-set-version/ignore_dependent/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/ignore_dependent/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/relative_absolute_conflict/mod.rs b/tests/cargo-set-version/relative_absolute_conflict/mod.rs index 845ff3c331..0b578c2d2e 100644 --- a/tests/cargo-set-version/relative_absolute_conflict/mod.rs +++ b/tests/cargo-set-version/relative_absolute_conflict/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .code(2) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/relative_absolute_conflict/stderr.log b/tests/cargo-set-version/relative_absolute_conflict/stderr.log deleted file mode 100644 index 27e73f33bd..0000000000 --- a/tests/cargo-set-version/relative_absolute_conflict/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ -error: the argument '[TARGET]' cannot be used with '--bump ' - -Usage: cargo set-version - -For more information, try '--help'. diff --git a/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg b/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg new file mode 100644 index 0000000000..adb7c57885 --- /dev/null +++ b/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: the argument '[TARGET]' cannot be used with '--bump <BUMP>' + + + + Usage: cargo set-version <TARGET> + + + + For more information, try '--help'. + + + + + + diff --git a/tests/cargo-set-version/relative_absolute_conflict/stdout.log b/tests/cargo-set-version/relative_absolute_conflict/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg b/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_absolute_version/mod.rs b/tests/cargo-set-version/set_absolute_version/mod.rs index 0f673a9f80..6e64c25cc9 100644 --- a/tests/cargo-set-version/set_absolute_version/mod.rs +++ b/tests/cargo-set-version/set_absolute_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_absolute_version/stderr.log b/tests/cargo-set-version/set_absolute_version/stderr.log deleted file mode 100644 index 4c22dbb990..0000000000 --- a/tests/cargo-set-version/set_absolute_version/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Upgrading sample from 0.1.0 to 2.0.0 diff --git a/tests/cargo-set-version/set_absolute_version/stderr.term.svg b/tests/cargo-set-version/set_absolute_version/stderr.term.svg new file mode 100644 index 0000000000..d0fac02e90 --- /dev/null +++ b/tests/cargo-set-version/set_absolute_version/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Upgrading sample from 0.1.0 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/set_absolute_version/stdout.log b/tests/cargo-set-version/set_absolute_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_absolute_version/stdout.term.svg b/tests/cargo-set-version/set_absolute_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_absolute_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs index 6c7239585e..cde3747daa 100644 --- a/tests/cargo-set-version/set_absolute_workspace_version/mod.rs +++ b/tests/cargo-set-version/set_absolute_workspace_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stderr.log b/tests/cargo-set-version/set_absolute_workspace_version/stderr.log deleted file mode 100644 index 71b7edc5c5..0000000000 --- a/tests/cargo-set-version/set_absolute_workspace_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Upgrading workspace version from 0.2.0 to 2.0.0 - Upgrading inherit_ws_version from 0.2.0 to 2.0.0 (inherited from workspace) - Updating workspace's dependency from 0.2 to 2.0 - Updating with_direct_dep's dependency from 0.2 to 2.0 diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg b/tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg new file mode 100644 index 0000000000..221cce039d --- /dev/null +++ b/tests/cargo-set-version/set_absolute_workspace_version/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Upgrading workspace version from 0.2.0 to 2.0.0 + + Upgrading inherit_ws_version from 0.2.0 to 2.0.0 (inherited from workspace) + + Updating workspace's dependency from 0.2 to 2.0 + + Updating with_direct_dep's dependency from 0.2 to 2.0 + + + + + + diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stdout.log b/tests/cargo-set-version/set_absolute_workspace_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg b/tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_absolute_workspace_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_relative_version/mod.rs b/tests/cargo-set-version/set_relative_version/mod.rs index 2bcb3b7b40..0d3fc42049 100644 --- a/tests/cargo-set-version/set_relative_version/mod.rs +++ b/tests/cargo-set-version/set_relative_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_relative_version/stderr.log b/tests/cargo-set-version/set_relative_version/stderr.log deleted file mode 100644 index e8b389684c..0000000000 --- a/tests/cargo-set-version/set_relative_version/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Upgrading sample from 0.1.0 to 1.0.0 diff --git a/tests/cargo-set-version/set_relative_version/stderr.term.svg b/tests/cargo-set-version/set_relative_version/stderr.term.svg new file mode 100644 index 0000000000..49b2f071d9 --- /dev/null +++ b/tests/cargo-set-version/set_relative_version/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Upgrading sample from 0.1.0 to 1.0.0 + + + + + + diff --git a/tests/cargo-set-version/set_relative_version/stdout.log b/tests/cargo-set-version/set_relative_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_relative_version/stdout.term.svg b/tests/cargo-set-version/set_relative_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_relative_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/set_relative_workspace_version/mod.rs b/tests/cargo-set-version/set_relative_workspace_version/mod.rs index cb8191f619..c10d36da01 100644 --- a/tests/cargo-set-version/set_relative_workspace_version/mod.rs +++ b/tests/cargo-set-version/set_relative_workspace_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/set_relative_workspace_version/stderr.log b/tests/cargo-set-version/set_relative_workspace_version/stderr.log deleted file mode 100644 index 4367101cd5..0000000000 --- a/tests/cargo-set-version/set_relative_workspace_version/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Upgrading workspace version from 0.2.0 to 1.0.0 - Upgrading inherit_ws_version from 0.2.0 to 1.0.0 (inherited from workspace) - Updating workspace's dependency from 0.2 to 1.0 - Updating with_direct_dep's dependency from 0.2 to 1.0 diff --git a/tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg b/tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg new file mode 100644 index 0000000000..e3b4a2b518 --- /dev/null +++ b/tests/cargo-set-version/set_relative_workspace_version/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Upgrading workspace version from 0.2.0 to 1.0.0 + + Upgrading inherit_ws_version from 0.2.0 to 1.0.0 (inherited from workspace) + + Updating workspace's dependency from 0.2 to 1.0 + + Updating with_direct_dep's dependency from 0.2 to 1.0 + + + + + + diff --git a/tests/cargo-set-version/set_relative_workspace_version/stdout.log b/tests/cargo-set-version/set_relative_workspace_version/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg b/tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/set_relative_workspace_version/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs index ac5297c8b2..b0b9bd28b1 100644 --- a/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs +++ b/tests/cargo-set-version/upgrade_compatible_dependency/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stderr.log b/tests/cargo-set-version/upgrade_compatible_dependency/stderr.log deleted file mode 100644 index f07cdf82da..0000000000 --- a/tests/cargo-set-version/upgrade_compatible_dependency/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 0.4.5 - Updating cargo-list-test-fixture's dependency from 0.4.3 to 0.4.5 diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg b/tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg new file mode 100644 index 0000000000..a737b21d0e --- /dev/null +++ b/tests/cargo-set-version/upgrade_compatible_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 0.4.5 + + Updating cargo-list-test-fixture's dependency from 0.4.3 to 0.4.5 + + + + + + diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stdout.log b/tests/cargo-set-version/upgrade_compatible_dependency/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg b/tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/upgrade_compatible_dependency/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs index cd92f521ac..7f069b160a 100644 --- a/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log b/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log deleted file mode 100644 index ce6ea0b334..0000000000 --- a/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg b/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg new file mode 100644 index 0000000000..91621df7b5 --- /dev/null +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.log b/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg b/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/upgrade_incompatible_dependency/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/upgrade_workspace/mod.rs b/tests/cargo-set-version/upgrade_workspace/mod.rs index 6ccc8cb47e..44ac893875 100644 --- a/tests/cargo-set-version/upgrade_workspace/mod.rs +++ b/tests/cargo-set-version/upgrade_workspace/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/upgrade_workspace/stderr.log b/tests/cargo-set-version/upgrade_workspace/stderr.log deleted file mode 100644 index 97683ef4a1..0000000000 --- a/tests/cargo-set-version/upgrade_workspace/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/upgrade_workspace/stderr.term.svg b/tests/cargo-set-version/upgrade_workspace/stderr.term.svg new file mode 100644 index 0000000000..6f81698384 --- /dev/null +++ b/tests/cargo-set-version/upgrade_workspace/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/upgrade_workspace/stdout.log b/tests/cargo-set-version/upgrade_workspace/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/upgrade_workspace/stdout.term.svg b/tests/cargo-set-version/upgrade_workspace/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/upgrade_workspace/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/virtual_workspace_deps/mod.rs b/tests/cargo-set-version/virtual_workspace_deps/mod.rs index 6ccc8cb47e..44ac893875 100644 --- a/tests/cargo-set-version/virtual_workspace_deps/mod.rs +++ b/tests/cargo-set-version/virtual_workspace_deps/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/virtual_workspace_deps/stderr.log b/tests/cargo-set-version/virtual_workspace_deps/stderr.log deleted file mode 100644 index 64f3edb2ba..0000000000 --- a/tests/cargo-set-version/virtual_workspace_deps/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating workspace's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg b/tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg new file mode 100644 index 0000000000..43085d9509 --- /dev/null +++ b/tests/cargo-set-version/virtual_workspace_deps/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating workspace's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/virtual_workspace_deps/stdout.log b/tests/cargo-set-version/virtual_workspace_deps/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg b/tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/virtual_workspace_deps/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/workspace_deps/mod.rs b/tests/cargo-set-version/workspace_deps/mod.rs index 6ccc8cb47e..44ac893875 100644 --- a/tests/cargo-set-version/workspace_deps/mod.rs +++ b/tests/cargo-set-version/workspace_deps/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/workspace_deps/stderr.log b/tests/cargo-set-version/workspace_deps/stderr.log deleted file mode 100644 index 64f3edb2ba..0000000000 --- a/tests/cargo-set-version/workspace_deps/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 - Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 - Updating workspace's dependency from 0.4.3 to 2.0.0 diff --git a/tests/cargo-set-version/workspace_deps/stderr.term.svg b/tests/cargo-set-version/workspace_deps/stderr.term.svg new file mode 100644 index 0000000000..43085d9509 --- /dev/null +++ b/tests/cargo-set-version/workspace_deps/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 + + Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 + + Updating workspace's dependency from 0.4.3 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/workspace_deps/stdout.log b/tests/cargo-set-version/workspace_deps/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/workspace_deps/stdout.term.svg b/tests/cargo-set-version/workspace_deps/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/workspace_deps/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/workspace_version_exclude/mod.rs b/tests/cargo-set-version/workspace_version_exclude/mod.rs index 43043024a4..308b2252b3 100644 --- a/tests/cargo-set-version/workspace_version_exclude/mod.rs +++ b/tests/cargo-set-version/workspace_version_exclude/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/workspace_version_exclude/stderr.log b/tests/cargo-set-version/workspace_version_exclude/stderr.log deleted file mode 100644 index 9551c0ea00..0000000000 --- a/tests/cargo-set-version/workspace_version_exclude/stderr.log +++ /dev/null @@ -1 +0,0 @@ -Error: Cannot exclude root package(s) when inherits-version package(s) modify `workspace.package.version` diff --git a/tests/cargo-set-version/workspace_version_exclude/stderr.term.svg b/tests/cargo-set-version/workspace_version_exclude/stderr.term.svg new file mode 100644 index 0000000000..780d474a6e --- /dev/null +++ b/tests/cargo-set-version/workspace_version_exclude/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Error: Cannot exclude root package(s) when inherits-version package(s) modify `workspace.package.version` + + + + + + diff --git a/tests/cargo-set-version/workspace_version_exclude/stdout.log b/tests/cargo-set-version/workspace_version_exclude/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/workspace_version_exclude/stdout.term.svg b/tests/cargo-set-version/workspace_version_exclude/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/workspace_version_exclude/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-set-version/workspace_version_subset/mod.rs b/tests/cargo-set-version/workspace_version_subset/mod.rs index 797c161ada..e6b7d714e6 100644 --- a/tests/cargo-set-version/workspace_version_subset/mod.rs +++ b/tests/cargo-set-version/workspace_version_subset/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-set-version/workspace_version_subset/stderr.log b/tests/cargo-set-version/workspace_version_subset/stderr.log deleted file mode 100644 index bbc19a21f9..0000000000 --- a/tests/cargo-set-version/workspace_version_subset/stderr.log +++ /dev/null @@ -1,4 +0,0 @@ - Upgrading workspace version from 0.1.0 to 2.0.0 - Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace) - Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace) - Updating workspace's dependency from 0.1.0 to 2.0.0 diff --git a/tests/cargo-set-version/workspace_version_subset/stderr.term.svg b/tests/cargo-set-version/workspace_version_subset/stderr.term.svg new file mode 100644 index 0000000000..f2e118423c --- /dev/null +++ b/tests/cargo-set-version/workspace_version_subset/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Upgrading workspace version from 0.1.0 to 2.0.0 + + Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace) + + Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace) + + Updating workspace's dependency from 0.1.0 to 2.0.0 + + + + + + diff --git a/tests/cargo-set-version/workspace_version_subset/stdout.log b/tests/cargo-set-version/workspace_version_subset/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-set-version/workspace_version_subset/stdout.term.svg b/tests/cargo-set-version/workspace_version_subset/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-set-version/workspace_version_subset/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/alt_registry/mod.rs b/tests/cargo-upgrade/alt_registry/mod.rs index 939d2c8970..af7f62ad58 100644 --- a/tests/cargo-upgrade/alt_registry/mod.rs +++ b/tests/cargo-upgrade/alt_registry/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_alt_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_alt_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log deleted file mode 100644 index b04a31f535..0000000000 --- a/tests/cargo-upgrade/alt_registry/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking none's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/alt_registry/stderr.term.svg b/tests/cargo-upgrade/alt_registry/stderr.term.svg new file mode 100644 index 0000000000..379b3f1e74 --- /dev/null +++ b/tests/cargo-upgrade/alt_registry/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking none's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/alt_registry/stdout.log b/tests/cargo-upgrade/alt_registry/stdout.log deleted file mode 100644 index 816d92908e..0000000000 --- a/tests/cargo-upgrade/alt_registry/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package1 0.1.1 0.1.1 99999.0.0 99999.0.0 -my-package2 0.2 0.2.3 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/alt_registry/stdout.term.svg b/tests/cargo-upgrade/alt_registry/stdout.term.svg new file mode 100644 index 0000000000..2b53d3b924 --- /dev/null +++ b/tests/cargo-upgrade/alt_registry/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package1 0.1.1 0.1.1 99999.0.0 99999.0.0 + + my-package2 0.2 0.2.3 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/cli_rust_version/mod.rs b/tests/cargo-upgrade/cli_rust_version/mod.rs index 81dd4f42c7..ae9871afd3 100644 --- a/tests/cargo-upgrade/cli_rust_version/mod.rs +++ b/tests/cargo-upgrade/cli_rust_version/mod.rs @@ -1,8 +1,9 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { @@ -22,7 +23,7 @@ fn case() { .rust_version("1.72.0") .publish(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -38,8 +39,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.log b/tests/cargo-upgrade/cli_rust_version/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/cli_rust_version/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.term.svg b/tests/cargo-upgrade/cli_rust_version/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/cli_rust_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/cli_rust_version/stdout.log b/tests/cargo-upgrade/cli_rust_version/stdout.log deleted file mode 100644 index 4ce02868d7..0000000000 --- a/tests/cargo-upgrade/cli_rust_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.3 0.2.0 0.2.0 diff --git a/tests/cargo-upgrade/cli_rust_version/stdout.term.svg b/tests/cargo-upgrade/cli_rust_version/stdout.term.svg new file mode 100644 index 0000000000..698dc8cb3a --- /dev/null +++ b/tests/cargo-upgrade/cli_rust_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.3 0.2.0 0.2.0 + + + + + + diff --git a/tests/cargo-upgrade/dry_run/mod.rs b/tests/cargo-upgrade/dry_run/mod.rs index 8e6c8cf0de..b2b1b6a11c 100644 --- a/tests/cargo-upgrade/dry_run/mod.rs +++ b/tests/cargo-upgrade/dry_run/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/dry_run/stderr.log b/tests/cargo-upgrade/dry_run/stderr.log deleted file mode 100644 index 1a63e3418e..0000000000 --- a/tests/cargo-upgrade/dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -warning: aborting upgrade due to dry run diff --git a/tests/cargo-upgrade/dry_run/stderr.term.svg b/tests/cargo-upgrade/dry_run/stderr.term.svg new file mode 100644 index 0000000000..6ab1405cd4 --- /dev/null +++ b/tests/cargo-upgrade/dry_run/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + warning: aborting upgrade due to dry run + + + + + + diff --git a/tests/cargo-upgrade/dry_run/stdout.log b/tests/cargo-upgrade/dry_run/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/dry_run/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/dry_run/stdout.term.svg b/tests/cargo-upgrade/dry_run/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/dry_run/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/exclude_dep/mod.rs b/tests/cargo-upgrade/exclude_dep/mod.rs index 34f411061c..21b5f3a0bc 100644 --- a/tests/cargo-upgrade/exclude_dep/mod.rs +++ b/tests/cargo-upgrade/exclude_dep/mod.rs @@ -1,15 +1,16 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); crate::add_git_registry_packages(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -26,8 +27,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log deleted file mode 100644 index 774ad6740f..0000000000 --- a/tests/cargo-upgrade/exclude_dep/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking None's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/exclude_dep/stderr.term.svg b/tests/cargo-upgrade/exclude_dep/stderr.term.svg new file mode 100644 index 0000000000..0239411b36 --- /dev/null +++ b/tests/cargo-upgrade/exclude_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking None's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/exclude_dep/stdout.log b/tests/cargo-upgrade/exclude_dep/stdout.log deleted file mode 100644 index fb894c05e4..0000000000 --- a/tests/cargo-upgrade/exclude_dep/stdout.log +++ /dev/null @@ -1,18 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -docopt 0.4 0.4.1 99999.0.0 0.4 excluded -pad 0.1 0.1.1 99999.0.0 99999.0 -serde_json 20.0 20.0.0 99999.0.0 99999.0 -syn 0.1.1 0.1.1 99999.0.0 99999.0.0 -tar 0.4 0.4.1 99999.0.0 99999.0 -ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 -toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 -semver 0.2 0.2.3 99999.0.0 99999.0 -renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 -assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 -tempdir 0.1 0.1.1 99999.0.0 99999.0 -serde 1.0 - - 1.0 -openssl 0.4 0.4.1 99999.0.0 99999.0 -rget 0.4.0 0.4.1 99999.0.0 99999.0.0 -geo 0.2.0 0.2.3 99999.0.0 99999.0.0 -ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/exclude_dep/stdout.term.svg b/tests/cargo-upgrade/exclude_dep/stdout.term.svg new file mode 100644 index 0000000000..31d97d277b --- /dev/null +++ b/tests/cargo-upgrade/exclude_dep/stdout.term.svg @@ -0,0 +1,59 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + docopt 0.4 0.4.1 99999.0.0 0.4 excluded + + pad 0.1 0.1.1 99999.0.0 99999.0 + + serde_json 20.0 20.0.0 99999.0.0 99999.0 + + syn 0.1.1 0.1.1 99999.0.0 99999.0.0 + + tar 0.4 0.4.1 99999.0.0 99999.0 + + ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 + + toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + semver 0.2 0.2.3 99999.0.0 99999.0 + + renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 + + assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 + + tempdir 0.1 0.1.1 99999.0.0 99999.0 + + serde 1.0 - - 1.0 + + openssl 0.4 0.4.1 99999.0.0 99999.0 + + rget 0.4.0 0.4.1 99999.0.0 99999.0.0 + + geo 0.2.0 0.2.3 99999.0.0 99999.0.0 + + ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/exclude_renamed/mod.rs b/tests/cargo-upgrade/exclude_renamed/mod.rs index a1ae27fe56..f895187ea8 100644 --- a/tests/cargo-upgrade/exclude_renamed/mod.rs +++ b/tests/cargo-upgrade/exclude_renamed/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -24,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/exclude_renamed/stderr.log b/tests/cargo-upgrade/exclude_renamed/stderr.log deleted file mode 100644 index 8055d9fa2a..0000000000 --- a/tests/cargo-upgrade/exclude_renamed/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/exclude_renamed/stderr.term.svg b/tests/cargo-upgrade/exclude_renamed/stderr.term.svg new file mode 100644 index 0000000000..541295ddd6 --- /dev/null +++ b/tests/cargo-upgrade/exclude_renamed/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + note: Re-run with `--pinned` to upgrade pinned version requirements + + + + + + diff --git a/tests/cargo-upgrade/exclude_renamed/stdout.log b/tests/cargo-upgrade/exclude_renamed/stdout.log deleted file mode 100644 index 55b53ea787..0000000000 --- a/tests/cargo-upgrade/exclude_renamed/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -toml_edit (te) 0.1.5 - 99999.0.0 0.1.5 pinned -regex (rx) 0.2 - - 0.2 excluded diff --git a/tests/cargo-upgrade/exclude_renamed/stdout.term.svg b/tests/cargo-upgrade/exclude_renamed/stdout.term.svg new file mode 100644 index 0000000000..ac3cd8b16a --- /dev/null +++ b/tests/cargo-upgrade/exclude_renamed/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + toml_edit (te) 0.1.5 - 99999.0.0 0.1.5 pinned + + regex (rx) 0.2 - - 0.2 excluded + + + + + + diff --git a/tests/cargo-upgrade/ignore_rust_version/mod.rs b/tests/cargo-upgrade/ignore_rust_version/mod.rs index f88bd553b8..d293c9a7ac 100644 --- a/tests/cargo-upgrade/ignore_rust_version/mod.rs +++ b/tests/cargo-upgrade/ignore_rust_version/mod.rs @@ -1,8 +1,9 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { @@ -19,7 +20,7 @@ fn case() { .rust_version("1.68.0") .publish(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -35,8 +36,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.log b/tests/cargo-upgrade/ignore_rust_version/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/ignore_rust_version/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.term.svg b/tests/cargo-upgrade/ignore_rust_version/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/ignore_rust_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/ignore_rust_version/stdout.log b/tests/cargo-upgrade/ignore_rust_version/stdout.log deleted file mode 100644 index 4ce02868d7..0000000000 --- a/tests/cargo-upgrade/ignore_rust_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.3 0.2.0 0.2.0 diff --git a/tests/cargo-upgrade/ignore_rust_version/stdout.term.svg b/tests/cargo-upgrade/ignore_rust_version/stdout.term.svg new file mode 100644 index 0000000000..698dc8cb3a --- /dev/null +++ b/tests/cargo-upgrade/ignore_rust_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.3 0.2.0 0.2.0 + + + + + + diff --git a/tests/cargo-upgrade/implicit_prerelease/mod.rs b/tests/cargo-upgrade/implicit_prerelease/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/implicit_prerelease/mod.rs +++ b/tests/cargo-upgrade/implicit_prerelease/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/implicit_prerelease/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.term.svg b/tests/cargo-upgrade/implicit_prerelease/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/implicit_prerelease/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/implicit_prerelease/stdout.log b/tests/cargo-upgrade/implicit_prerelease/stdout.log deleted file mode 100644 index 394e2bbb50..0000000000 --- a/tests/cargo-upgrade/implicit_prerelease/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -unrelated-crate 1.0 - 99999.0.0 99999.0 -my-package 0.1.1-alpha.1 0.1.1 99999.1.0-alpha.1 99999.1.0-alpha.1 diff --git a/tests/cargo-upgrade/implicit_prerelease/stdout.term.svg b/tests/cargo-upgrade/implicit_prerelease/stdout.term.svg new file mode 100644 index 0000000000..58b087e8e5 --- /dev/null +++ b/tests/cargo-upgrade/implicit_prerelease/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + unrelated-crate 1.0 - 99999.0.0 99999.0 + + my-package 0.1.1-alpha.1 0.1.1 99999.1.0-alpha.1 99999.1.0-alpha.1 + + + + + + diff --git a/tests/cargo-upgrade/invalid_dep/mod.rs b/tests/cargo-upgrade/invalid_dep/mod.rs index 06d6f4eacb..e08f268a28 100644 --- a/tests/cargo-upgrade/invalid_dep/mod.rs +++ b/tests/cargo-upgrade/invalid_dep/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_dep/stderr.log b/tests/cargo-upgrade/invalid_dep/stderr.log deleted file mode 100644 index cdbc04aff8..0000000000 --- a/tests/cargo-upgrade/invalid_dep/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -Error: dependency failure doesn't exist diff --git a/tests/cargo-upgrade/invalid_dep/stderr.term.svg b/tests/cargo-upgrade/invalid_dep/stderr.term.svg new file mode 100644 index 0000000000..6ccfc60b90 --- /dev/null +++ b/tests/cargo-upgrade/invalid_dep/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Error: dependency failure doesn't exist + + + + + + diff --git a/tests/cargo-upgrade/invalid_dep/stdout.log b/tests/cargo-upgrade/invalid_dep/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_dep/stdout.term.svg b/tests/cargo-upgrade/invalid_dep/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_dep/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_flag/mod.rs b/tests/cargo-upgrade/invalid_flag/mod.rs index 64c0ff2abc..be19844876 100644 --- a/tests/cargo-upgrade/invalid_flag/mod.rs +++ b/tests/cargo-upgrade/invalid_flag/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .code(2) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_flag/stderr.log b/tests/cargo-upgrade/invalid_flag/stderr.log deleted file mode 100644 index a0c54c468c..0000000000 --- a/tests/cargo-upgrade/invalid_flag/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ -error: unexpected argument '--flag' found - -Usage: cargo upgrade [OPTIONS] - -For more information, try '--help'. diff --git a/tests/cargo-upgrade/invalid_flag/stderr.term.svg b/tests/cargo-upgrade/invalid_flag/stderr.term.svg new file mode 100644 index 0000000000..259e8e7641 --- /dev/null +++ b/tests/cargo-upgrade/invalid_flag/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + error: unexpected argument '--flag' found + + + + Usage: cargo upgrade [OPTIONS] + + + + For more information, try '--help'. + + + + + + diff --git a/tests/cargo-upgrade/invalid_flag/stdout.log b/tests/cargo-upgrade/invalid_flag/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_flag/stdout.term.svg b/tests/cargo-upgrade/invalid_flag/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_flag/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_manifest/mod.rs b/tests/cargo-upgrade/invalid_manifest/mod.rs index be8d17d394..b221a9ccf3 100644 --- a/tests/cargo-upgrade/invalid_manifest/mod.rs +++ b/tests/cargo-upgrade/invalid_manifest/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -17,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.log b/tests/cargo-upgrade/invalid_manifest/stderr.log deleted file mode 100644 index cc5355e613..0000000000 --- a/tests/cargo-upgrade/invalid_manifest/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ -Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` -error: expected `.`, `=` - --> Cargo.toml:1:6 - | -1 | This is clearly not a valid Cargo.toml. - | ^ - | - diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.term.svg b/tests/cargo-upgrade/invalid_manifest/stderr.term.svg new file mode 100644 index 0000000000..e3a09ca380 --- /dev/null +++ b/tests/cargo-upgrade/invalid_manifest/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Error: `cargo metadata` exited with an error: error: expected `.`, `=` + + --> Cargo.toml:1:6 + + | + + 1 | This is clearly not a valid Cargo.toml. + + | ^ + + | + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_manifest/stdout.log b/tests/cargo-upgrade/invalid_manifest/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_manifest/stdout.term.svg b/tests/cargo-upgrade/invalid_manifest/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_manifest/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs index be8d17d394..b221a9ccf3 100644 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -17,8 +18,8 @@ fn case() { .current_dir(cwd) .assert() .code(1) - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log deleted file mode 100644 index 3e8f34ec56..0000000000 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ -Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -... diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg new file mode 100644 index 0000000000..e3a09ca380 --- /dev/null +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Error: `cargo metadata` exited with an error: error: expected `.`, `=` + + --> Cargo.toml:1:6 + + | + + 1 | This is clearly not a valid Cargo.toml. + + | ^ + + | + + + + + + + + diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg b/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg new file mode 100644 index 0000000000..46f201ab87 --- /dev/null +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stdout.term.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/tests/cargo-upgrade/locked/mod.rs b/tests/cargo-upgrade/locked/mod.rs index 3907b034f1..9a65f9a2e7 100644 --- a/tests/cargo-upgrade/locked/mod.rs +++ b/tests/cargo-upgrade/locked/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/locked/stderr.log b/tests/cargo-upgrade/locked/stderr.log deleted file mode 100644 index aecfc3d339..0000000000 --- a/tests/cargo-upgrade/locked/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/locked/stderr.term.svg b/tests/cargo-upgrade/locked/stderr.term.svg new file mode 100644 index 0000000000..77b53e2e0d --- /dev/null +++ b/tests/cargo-upgrade/locked/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Error: cannot upgrade due to `--locked` + + + + + + diff --git a/tests/cargo-upgrade/locked/stdout.log b/tests/cargo-upgrade/locked/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/locked/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/locked/stdout.term.svg b/tests/cargo-upgrade/locked/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/locked/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/locked_dry_run/mod.rs b/tests/cargo-upgrade/locked_dry_run/mod.rs index 61b4d20875..d2c472b6c8 100644 --- a/tests/cargo-upgrade/locked_dry_run/mod.rs +++ b/tests/cargo-upgrade/locked_dry_run/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .failure() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/locked_dry_run/stderr.log b/tests/cargo-upgrade/locked_dry_run/stderr.log deleted file mode 100644 index aecfc3d339..0000000000 --- a/tests/cargo-upgrade/locked_dry_run/stderr.log +++ /dev/null @@ -1,2 +0,0 @@ - Checking cargo-list-test-fixture's dependencies -Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/locked_dry_run/stderr.term.svg b/tests/cargo-upgrade/locked_dry_run/stderr.term.svg new file mode 100644 index 0000000000..77b53e2e0d --- /dev/null +++ b/tests/cargo-upgrade/locked_dry_run/stderr.term.svg @@ -0,0 +1,27 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Error: cannot upgrade due to `--locked` + + + + + + diff --git a/tests/cargo-upgrade/locked_dry_run/stdout.log b/tests/cargo-upgrade/locked_dry_run/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/locked_dry_run/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/locked_dry_run/stdout.term.svg b/tests/cargo-upgrade/locked_dry_run/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/locked_dry_run/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/lockfile/mod.rs b/tests/cargo-upgrade/lockfile/mod.rs index 48a32ada0a..b45a3ebcc6 100644 --- a/tests/cargo-upgrade/lockfile/mod.rs +++ b/tests/cargo-upgrade/lockfile/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/lockfile/out/Cargo.lock b/tests/cargo-upgrade/lockfile/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/lockfile/out/Cargo.lock +++ b/tests/cargo-upgrade/lockfile/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/lockfile/stderr.log b/tests/cargo-upgrade/lockfile/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/lockfile/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/lockfile/stderr.term.svg b/tests/cargo-upgrade/lockfile/stderr.term.svg new file mode 100644 index 0000000000..6e00b2f0f1 --- /dev/null +++ b/tests/cargo-upgrade/lockfile/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Checking four's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/lockfile/stdout.log b/tests/cargo-upgrade/lockfile/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/lockfile/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/lockfile/stdout.term.svg b/tests/cargo-upgrade/lockfile/stdout.term.svg new file mode 100644 index 0000000000..ed532bd65c --- /dev/null +++ b/tests/cargo-upgrade/lockfile/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/optional_dep/mod.rs b/tests/cargo-upgrade/optional_dep/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/optional_dep/mod.rs +++ b/tests/cargo-upgrade/optional_dep/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/optional_dep/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/optional_dep/stderr.term.svg b/tests/cargo-upgrade/optional_dep/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/optional_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/optional_dep/stdout.log b/tests/cargo-upgrade/optional_dep/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/optional_dep/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/optional_dep/stdout.term.svg b/tests/cargo-upgrade/optional_dep/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/optional_dep/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/package_rust_version/mod.rs b/tests/cargo-upgrade/package_rust_version/mod.rs index bea60c0f11..f44ebaa0a4 100644 --- a/tests/cargo-upgrade/package_rust_version/mod.rs +++ b/tests/cargo-upgrade/package_rust_version/mod.rs @@ -1,8 +1,9 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { @@ -19,7 +20,7 @@ fn case() { .rust_version("1.68.0") .publish(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -29,8 +30,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/package_rust_version/stderr.log b/tests/cargo-upgrade/package_rust_version/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/package_rust_version/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/package_rust_version/stderr.term.svg b/tests/cargo-upgrade/package_rust_version/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/package_rust_version/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/package_rust_version/stdout.log b/tests/cargo-upgrade/package_rust_version/stdout.log deleted file mode 100644 index 622ed9e9c6..0000000000 --- a/tests/cargo-upgrade/package_rust_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.2 0.1.2 0.1.2 diff --git a/tests/cargo-upgrade/package_rust_version/stdout.term.svg b/tests/cargo-upgrade/package_rust_version/stdout.term.svg new file mode 100644 index 0000000000..4a95014486 --- /dev/null +++ b/tests/cargo-upgrade/package_rust_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.2 0.1.2 0.1.2 + + + + + + diff --git a/tests/cargo-upgrade/pinned/mod.rs b/tests/cargo-upgrade/pinned/mod.rs index 5f5a18b53a..9c50c9aa84 100644 --- a/tests/cargo-upgrade/pinned/mod.rs +++ b/tests/cargo-upgrade/pinned/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_op_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log deleted file mode 100644 index 8e6e2dcce0..0000000000 --- a/tests/cargo-upgrade/pinned/stderr.log +++ /dev/null @@ -1,6 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/pinned/stderr.term.svg b/tests/cargo-upgrade/pinned/stderr.term.svg new file mode 100644 index 0000000000..e2827e8550 --- /dev/null +++ b/tests/cargo-upgrade/pinned/stderr.term.svg @@ -0,0 +1,31 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--pinned` to upgrade pinned version requirements + + + + + + diff --git a/tests/cargo-upgrade/pinned/stdout.log b/tests/cargo-upgrade/pinned/stdout.log deleted file mode 100644 index 6a51fc04eb..0000000000 --- a/tests/cargo-upgrade/pinned/stdout.log +++ /dev/null @@ -1,11 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -default 0.2 0.2.3 99999.0.0 99999.0 -exact =0.2 0.2.3 99999.0.0 =0.2 pinned -lessthan <0.2 0.1.1 99999.0.0 <0.2 pinned -lessorequal <=0.2 0.2.3 99999.0.0 <=0.2 pinned -caret ^0.2 0.2.3 99999.0.0 ^99999.0 -tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 -greaterthan >0.2 99999.0.0 99999.0.0 >0.2 -greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 -wildcard 0.2.* 0.2.3 99999.0.0 0.2.* pinned diff --git a/tests/cargo-upgrade/pinned/stdout.term.svg b/tests/cargo-upgrade/pinned/stdout.term.svg new file mode 100644 index 0000000000..5a45e362a8 --- /dev/null +++ b/tests/cargo-upgrade/pinned/stdout.term.svg @@ -0,0 +1,45 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + default 0.2 0.2.3 99999.0.0 99999.0 + + exact =0.2 0.2.3 99999.0.0 =0.2 pinned + + lessthan <0.2 0.1.1 99999.0.0 <0.2 pinned + + lessorequal <=0.2 0.2.3 99999.0.0 <=0.2 pinned + + caret ^0.2 0.2.3 99999.0.0 ^99999.0 + + tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 + + greaterthan >0.2 99999.0.0 99999.0.0 >0.2 + + greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 + + wildcard 0.2.* 0.2.3 99999.0.0 0.2.* pinned + + + + + + diff --git a/tests/cargo-upgrade/preserve_op/mod.rs b/tests/cargo-upgrade/preserve_op/mod.rs index 4e69cc58be..e5c519340c 100644 --- a/tests/cargo-upgrade/preserve_op/mod.rs +++ b/tests/cargo-upgrade/preserve_op/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_op_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_op/stderr.log b/tests/cargo-upgrade/preserve_op/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_op/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_op/stderr.term.svg b/tests/cargo-upgrade/preserve_op/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_op/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_op/stdout.log b/tests/cargo-upgrade/preserve_op/stdout.log deleted file mode 100644 index 5b4a077b66..0000000000 --- a/tests/cargo-upgrade/preserve_op/stdout.log +++ /dev/null @@ -1,11 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -default 0.2 0.2.3 99999.0.0 99999.0 -exact =0.2 0.2.3 99999.0.0 =99999.0 -lessthan <0.2 0.1.1 99999.0.0 99999.0.0 -lessorequal <=0.2 0.2.3 99999.0.0 99999.0.0 -caret ^0.2 0.2.3 99999.0.0 ^99999.0 -tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 -greaterthan >0.2 99999.0.0 99999.0.0 >0.2 -greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 -wildcard 0.2.* 0.2.3 99999.0.0 99999.0.* diff --git a/tests/cargo-upgrade/preserve_op/stdout.term.svg b/tests/cargo-upgrade/preserve_op/stdout.term.svg new file mode 100644 index 0000000000..d18c8ddbdb --- /dev/null +++ b/tests/cargo-upgrade/preserve_op/stdout.term.svg @@ -0,0 +1,45 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + default 0.2 0.2.3 99999.0.0 99999.0 + + exact =0.2 0.2.3 99999.0.0 =99999.0 + + lessthan <0.2 0.1.1 99999.0.0 99999.0.0 + + lessorequal <=0.2 0.2.3 99999.0.0 99999.0.0 + + caret ^0.2 0.2.3 99999.0.0 ^99999.0 + + tilde ~0.2.0 0.2.3 99999.0.0 ~99999.0.0 + + greaterthan >0.2 99999.0.0 99999.0.0 >0.2 + + greaterorequal >=0.2.0 99999.0.0 99999.0.0 >=0.2.0 + + wildcard 0.2.* 0.2.3 99999.0.0 99999.0.* + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_major/mod.rs b/tests/cargo-upgrade/preserve_precision_major/mod.rs index a4a73a011f..28d7791c13 100644 --- a/tests/cargo-upgrade/preserve_precision_major/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_major/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_precision_major/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.term.svg b/tests/cargo-upgrade/preserve_precision_major/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_major/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_major/stdout.log b/tests/cargo-upgrade/preserve_precision_major/stdout.log deleted file mode 100644 index 04d1b6cc49..0000000000 --- a/tests/cargo-upgrade/preserve_precision_major/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0 0.4.1 99999.0.0 99999 diff --git a/tests/cargo-upgrade/preserve_precision_major/stdout.term.svg b/tests/cargo-upgrade/preserve_precision_major/stdout.term.svg new file mode 100644 index 0000000000..47c7edb700 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_major/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0 0.4.1 99999.0.0 99999 + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_minor/mod.rs b/tests/cargo-upgrade/preserve_precision_minor/mod.rs index a4a73a011f..28d7791c13 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_minor/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg b/tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_minor/stdout.log b/tests/cargo-upgrade/preserve_precision_minor/stdout.log deleted file mode 100644 index ba6eab01f9..0000000000 --- a/tests/cargo-upgrade/preserve_precision_minor/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1 0.1.1 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg b/tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg new file mode 100644 index 0000000000..6a44d13ca7 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_minor/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1 0.1.1 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_patch/mod.rs b/tests/cargo-upgrade/preserve_precision_patch/mod.rs index a4a73a011f..28d7791c13 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/mod.rs +++ b/tests/cargo-upgrade/preserve_precision_patch/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg b/tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserve_precision_patch/stdout.log b/tests/cargo-upgrade/preserve_precision_patch/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/preserve_precision_patch/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg b/tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/preserve_precision_patch/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/preserves_inline_table/mod.rs b/tests/cargo-upgrade/preserves_inline_table/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/preserves_inline_table/mod.rs +++ b/tests/cargo-upgrade/preserves_inline_table/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserves_inline_table/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.term.svg b/tests/cargo-upgrade/preserves_inline_table/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserves_inline_table/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserves_inline_table/stdout.log b/tests/cargo-upgrade/preserves_inline_table/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/preserves_inline_table/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserves_inline_table/stdout.term.svg b/tests/cargo-upgrade/preserves_inline_table/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/preserves_inline_table/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/preserves_std_table/mod.rs b/tests/cargo-upgrade/preserves_std_table/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/preserves_std_table/mod.rs +++ b/tests/cargo-upgrade/preserves_std_table/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/preserves_std_table/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.term.svg b/tests/cargo-upgrade/preserves_std_table/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/preserves_std_table/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/preserves_std_table/stdout.log b/tests/cargo-upgrade/preserves_std_table/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/preserves_std_table/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserves_std_table/stdout.term.svg b/tests/cargo-upgrade/preserves_std_table/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/preserves_std_table/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/single_dep/mod.rs b/tests/cargo-upgrade/single_dep/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/single_dep/mod.rs +++ b/tests/cargo-upgrade/single_dep/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/single_dep/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/single_dep/stderr.term.svg b/tests/cargo-upgrade/single_dep/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/single_dep/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/single_dep/stdout.log b/tests/cargo-upgrade/single_dep/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/single_dep/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/single_dep/stdout.term.svg b/tests/cargo-upgrade/single_dep/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/single_dep/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/skip_compatible/mod.rs b/tests/cargo-upgrade/skip_compatible/mod.rs index a401fff131..70155b2e1c 100644 --- a/tests/cargo-upgrade/skip_compatible/mod.rs +++ b/tests/cargo-upgrade/skip_compatible/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_breaking_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/skip_compatible/stderr.log b/tests/cargo-upgrade/skip_compatible/stderr.log deleted file mode 100644 index 68e70d213d..0000000000 --- a/tests/cargo-upgrade/skip_compatible/stderr.log +++ /dev/null @@ -1,3 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -note: Re-run with `--incompatible` to upgrade incompatible version requirements diff --git a/tests/cargo-upgrade/skip_compatible/stderr.term.svg b/tests/cargo-upgrade/skip_compatible/stderr.term.svg new file mode 100644 index 0000000000..4fcbd29aea --- /dev/null +++ b/tests/cargo-upgrade/skip_compatible/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + note: Re-run with `--incompatible` to upgrade incompatible version requirements + + + + + + diff --git a/tests/cargo-upgrade/skip_compatible/stdout.log b/tests/cargo-upgrade/skip_compatible/stdout.log deleted file mode 100644 index ee0fe9c5b8..0000000000 --- a/tests/cargo-upgrade/skip_compatible/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req note -==== ======= ========== ====== ======= ==== -test_breaking 0.1 - 0.2.0 0.1 incompatible -test_nonbreaking 0.1.0 0.1.2 0.1.2 0.1.2 diff --git a/tests/cargo-upgrade/skip_compatible/stdout.term.svg b/tests/cargo-upgrade/skip_compatible/stdout.term.svg new file mode 100644 index 0000000000..1950c2e8c6 --- /dev/null +++ b/tests/cargo-upgrade/skip_compatible/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req note + + ==== ======= ========== ====== ======= ==== + + test_breaking 0.1 - 0.2.0 0.1 incompatible + + test_nonbreaking 0.1.0 0.1.2 0.1.2 0.1.2 + + + + + + diff --git a/tests/cargo-upgrade/specified/mod.rs b/tests/cargo-upgrade/specified/mod.rs index afc9beeb47..347d0f67e6 100644 --- a/tests/cargo-upgrade/specified/mod.rs +++ b/tests/cargo-upgrade/specified/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log deleted file mode 100644 index ce9696ae2f..0000000000 --- a/tests/cargo-upgrade/specified/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - excluded: my-package2 diff --git a/tests/cargo-upgrade/specified/stderr.term.svg b/tests/cargo-upgrade/specified/stderr.term.svg new file mode 100644 index 0000000000..c8910ce42f --- /dev/null +++ b/tests/cargo-upgrade/specified/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + excluded: my-package2 + + + + + + diff --git a/tests/cargo-upgrade/specified/stdout.log b/tests/cargo-upgrade/specified/stdout.log deleted file mode 100644 index 2c55b48ce3..0000000000 --- a/tests/cargo-upgrade/specified/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package1 0.1 0.1.1 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/specified/stdout.term.svg b/tests/cargo-upgrade/specified/stdout.term.svg new file mode 100644 index 0000000000..fb465a0b71 --- /dev/null +++ b/tests/cargo-upgrade/specified/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package1 0.1 0.1.1 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/to_version/mod.rs b/tests/cargo-upgrade/to_version/mod.rs index 22e5d384ed..8bcf5a10f0 100644 --- a/tests/cargo-upgrade/to_version/mod.rs +++ b/tests/cargo-upgrade/to_version/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -25,8 +26,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/to_version/stderr.log b/tests/cargo-upgrade/to_version/stderr.log deleted file mode 100644 index b4cda1e371..0000000000 --- a/tests/cargo-upgrade/to_version/stderr.log +++ /dev/null @@ -1 +0,0 @@ - Checking cargo-list-test-fixture's dependencies diff --git a/tests/cargo-upgrade/to_version/stderr.term.svg b/tests/cargo-upgrade/to_version/stderr.term.svg new file mode 100644 index 0000000000..77d1d45e49 --- /dev/null +++ b/tests/cargo-upgrade/to_version/stderr.term.svg @@ -0,0 +1,25 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + + + + + diff --git a/tests/cargo-upgrade/to_version/stdout.log b/tests/cargo-upgrade/to_version/stdout.log deleted file mode 100644 index e5073213ee..0000000000 --- a/tests/cargo-upgrade/to_version/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -docopt 0.4.0 0.4.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/to_version/stdout.term.svg b/tests/cargo-upgrade/to_version/stdout.term.svg new file mode 100644 index 0000000000..278797847a --- /dev/null +++ b/tests/cargo-upgrade/to_version/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + docopt 0.4.0 0.4.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_all/mod.rs b/tests/cargo-upgrade/upgrade_all/mod.rs index 48a32ada0a..b45a3ebcc6 100644 --- a/tests/cargo-upgrade/upgrade_all/mod.rs +++ b/tests/cargo-upgrade/upgrade_all/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_all/out/Cargo.lock b/tests/cargo-upgrade/upgrade_all/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/upgrade_all/out/Cargo.lock +++ b/tests/cargo-upgrade/upgrade_all/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/upgrade_all/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_all/stderr.term.svg b/tests/cargo-upgrade/upgrade_all/stderr.term.svg new file mode 100644 index 0000000000..9d3ea9de87 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_all/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_all/stdout.log b/tests/cargo-upgrade/upgrade_all/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/upgrade_all/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_all/stdout.term.svg b/tests/cargo-upgrade/upgrade_all/stdout.term.svg new file mode 100644 index 0000000000..d600778bd0 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_all/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_everything/mod.rs b/tests/cargo-upgrade/upgrade_everything/mod.rs index 1bbb8514c7..6647ab6d38 100644 --- a/tests/cargo-upgrade/upgrade_everything/mod.rs +++ b/tests/cargo-upgrade/upgrade_everything/mod.rs @@ -1,15 +1,16 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); crate::add_git_registry_packages(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -19,8 +20,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log deleted file mode 100644 index 796318abdf..0000000000 --- a/tests/cargo-upgrade/upgrade_everything/stderr.log +++ /dev/null @@ -1,7 +0,0 @@ - Checking None's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - latest: serde diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.term.svg b/tests/cargo-upgrade/upgrade_everything/stderr.term.svg new file mode 100644 index 0000000000..4da5e7c4f2 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_everything/stderr.term.svg @@ -0,0 +1,33 @@ + + + + + + + Checking None's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + latest: serde + + + + + + diff --git a/tests/cargo-upgrade/upgrade_everything/stdout.log b/tests/cargo-upgrade/upgrade_everything/stdout.log deleted file mode 100644 index 493c5ec850..0000000000 --- a/tests/cargo-upgrade/upgrade_everything/stdout.log +++ /dev/null @@ -1,17 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -docopt 0.4 0.4.1 99999.0.0 99999.0 -pad 0.1 0.1.1 99999.0.0 99999.0 -serde_json 20.0 20.0.0 99999.0.0 99999.0 -syn 0.1.1 0.1.1 99999.0.0 99999.0.0 -tar 0.4 0.4.1 99999.0.0 99999.0 -ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 -toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 -semver 0.2 0.2.3 99999.0.0 99999.0 -renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 -assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 -tempdir 0.1 0.1.1 99999.0.0 99999.0 -openssl 0.4 0.4.1 99999.0.0 99999.0 -rget 0.4.0 0.4.1 99999.0.0 99999.0.0 -geo 0.2.0 0.2.3 99999.0.0 99999.0.0 -ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_everything/stdout.term.svg b/tests/cargo-upgrade/upgrade_everything/stdout.term.svg new file mode 100644 index 0000000000..d12dd233aa --- /dev/null +++ b/tests/cargo-upgrade/upgrade_everything/stdout.term.svg @@ -0,0 +1,57 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + docopt 0.4 0.4.1 99999.0.0 99999.0 + + pad 0.1 0.1.1 99999.0.0 99999.0 + + serde_json 20.0 20.0.0 99999.0.0 99999.0 + + syn 0.1.1 0.1.1 99999.0.0 99999.0.0 + + tar 0.4 0.4.1 99999.0.0 99999.0 + + ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 + + toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + semver 0.2 0.2.3 99999.0.0 99999.0 + + renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 + + assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 + + tempdir 0.1 0.1.1 99999.0.0 99999.0 + + openssl 0.4 0.4.1 99999.0.0 99999.0 + + rget 0.4.0 0.4.1 99999.0.0 99999.0.0 + + geo 0.2.0 0.2.3 99999.0.0 99999.0.0 + + ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_renamed/mod.rs b/tests/cargo-upgrade/upgrade_renamed/mod.rs index ed610c1432..0b3677c508 100644 --- a/tests/cargo-upgrade/upgrade_renamed/mod.rs +++ b/tests/cargo-upgrade/upgrade_renamed/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log deleted file mode 100644 index 85e1821fc0..0000000000 --- a/tests/cargo-upgrade/upgrade_renamed/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking cargo-list-test-fixture's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.term.svg b/tests/cargo-upgrade/upgrade_renamed/stderr.term.svg new file mode 100644 index 0000000000..15007f45a2 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_renamed/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking cargo-list-test-fixture's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_renamed/stdout.log b/tests/cargo-upgrade/upgrade_renamed/stdout.log deleted file mode 100644 index ea805e1576..0000000000 --- a/tests/cargo-upgrade/upgrade_renamed/stdout.log +++ /dev/null @@ -1,4 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package1 (m1) 0.1.1 0.1.1 99999.0.0 99999.0.0 -my-package2 (m2) 0.2 0.2.3 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/upgrade_renamed/stdout.term.svg b/tests/cargo-upgrade/upgrade_renamed/stdout.term.svg new file mode 100644 index 0000000000..08b457ac07 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_renamed/stdout.term.svg @@ -0,0 +1,31 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package1 (m1) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + my-package2 (m2) 0.2 0.2.3 99999.0.0 99999.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_verbose/mod.rs b/tests/cargo-upgrade/upgrade_verbose/mod.rs index 04a9c70fc7..c4f09d994f 100644 --- a/tests/cargo-upgrade/upgrade_verbose/mod.rs +++ b/tests/cargo-upgrade/upgrade_verbose/mod.rs @@ -1,15 +1,16 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { cargo_test_support::registry::init(); crate::add_everything_registry_packages(false); crate::add_git_registry_packages(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -19,8 +20,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.log b/tests/cargo-upgrade/upgrade_verbose/stderr.log deleted file mode 100644 index 774ad6740f..0000000000 --- a/tests/cargo-upgrade/upgrade_verbose/stderr.log +++ /dev/null @@ -1,5 +0,0 @@ - Checking None's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.term.svg b/tests/cargo-upgrade/upgrade_verbose/stderr.term.svg new file mode 100644 index 0000000000..0239411b36 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_verbose/stderr.term.svg @@ -0,0 +1,29 @@ + + + + + + + Checking None's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_verbose/stdout.log b/tests/cargo-upgrade/upgrade_verbose/stdout.log deleted file mode 100644 index 324448b777..0000000000 --- a/tests/cargo-upgrade/upgrade_verbose/stdout.log +++ /dev/null @@ -1,18 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -docopt 0.4 0.4.1 99999.0.0 99999.0 -pad 0.1 0.1.1 99999.0.0 99999.0 -serde_json 20.0 20.0.0 99999.0.0 99999.0 -syn 0.1.1 0.1.1 99999.0.0 99999.0.0 -tar 0.4 0.4.1 99999.0.0 99999.0 -ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 -toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 -semver 0.2 0.2.3 99999.0.0 99999.0 -renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 -assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 -tempdir 0.1 0.1.1 99999.0.0 99999.0 -serde 1.0 - - 1.0 -openssl 0.4 0.4.1 99999.0.0 99999.0 -rget 0.4.0 0.4.1 99999.0.0 99999.0.0 -geo 0.2.0 0.2.3 99999.0.0 99999.0.0 -ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_verbose/stdout.term.svg b/tests/cargo-upgrade/upgrade_verbose/stdout.term.svg new file mode 100644 index 0000000000..67791d9a76 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_verbose/stdout.term.svg @@ -0,0 +1,59 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + docopt 0.4 0.4.1 99999.0.0 99999.0 + + pad 0.1 0.1.1 99999.0.0 99999.0 + + serde_json 20.0 20.0.0 99999.0.0 99999.0 + + syn 0.1.1 0.1.1 99999.0.0 99999.0.0 + + tar 0.4 0.4.1 99999.0.0 99999.0 + + ftp 20.0.0 20.0.0 99999.0.0 99999.0.0 + + toml_edit (te) 0.1.1 0.1.1 99999.0.0 99999.0.0 + + semver 0.2 0.2.3 99999.0.0 99999.0 + + renamed (rn) 0.1 0.1.1 99999.0.0 99999.0 + + assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0 + + tempdir 0.1 0.1.1 99999.0.0 99999.0 + + serde 1.0 - - 1.0 + + openssl 0.4 0.4.1 99999.0.0 99999.0 + + rget 0.4.0 0.4.1 99999.0.0 99999.0.0 + + geo 0.2.0 0.2.3 99999.0.0 99999.0.0 + + ftp 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/upgrade_workspace/mod.rs b/tests/cargo-upgrade/upgrade_workspace/mod.rs index 01b7001035..9bb2a22dd3 100644 --- a/tests/cargo-upgrade/upgrade_workspace/mod.rs +++ b/tests/cargo-upgrade/upgrade_workspace/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock b/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock +++ b/tests/cargo-upgrade/upgrade_workspace/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/upgrade_workspace/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.term.svg b/tests/cargo-upgrade/upgrade_workspace/stderr.term.svg new file mode 100644 index 0000000000..9d3ea9de87 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_workspace/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/upgrade_workspace/stdout.log b/tests/cargo-upgrade/upgrade_workspace/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/upgrade_workspace/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_workspace/stdout.term.svg b/tests/cargo-upgrade/upgrade_workspace/stdout.term.svg new file mode 100644 index 0000000000..d600778bd0 --- /dev/null +++ b/tests/cargo-upgrade/upgrade_workspace/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/virtual_manifest/mod.rs b/tests/cargo-upgrade/virtual_manifest/mod.rs index dbdf0ba095..7122af4889 100644 --- a/tests/cargo-upgrade/virtual_manifest/mod.rs +++ b/tests/cargo-upgrade/virtual_manifest/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -24,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock b/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock index cf9ab2a326..4fac7d5f38 100644 --- a/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock +++ b/tests/cargo-upgrade/virtual_manifest/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log deleted file mode 100644 index 1085f9ef99..0000000000 --- a/tests/cargo-upgrade/virtual_manifest/stderr.log +++ /dev/null @@ -1,9 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.term.svg b/tests/cargo-upgrade/virtual_manifest/stderr.term.svg new file mode 100644 index 0000000000..9d3ea9de87 --- /dev/null +++ b/tests/cargo-upgrade/virtual_manifest/stderr.term.svg @@ -0,0 +1,37 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + + + + + diff --git a/tests/cargo-upgrade/virtual_manifest/stdout.log b/tests/cargo-upgrade/virtual_manifest/stdout.log deleted file mode 100644 index 0dec0d1dfa..0000000000 --- a/tests/cargo-upgrade/virtual_manifest/stdout.log +++ /dev/null @@ -1,13 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -three 0.1.0 - - 0.1.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/virtual_manifest/stdout.term.svg b/tests/cargo-upgrade/virtual_manifest/stdout.term.svg new file mode 100644 index 0000000000..d600778bd0 --- /dev/null +++ b/tests/cargo-upgrade/virtual_manifest/stdout.term.svg @@ -0,0 +1,49 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + three 0.1.0 - - 0.1.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/workspace_inheritance/mod.rs b/tests/cargo-upgrade/workspace_inheritance/mod.rs index 973b04ef75..d4593f7553 100644 --- a/tests/cargo-upgrade/workspace_inheritance/mod.rs +++ b/tests/cargo-upgrade/workspace_inheritance/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = &project_root; @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock b/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock index cd11e50ad0..2b59bda009 100644 --- a/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock +++ b/tests/cargo-upgrade/workspace_inheritance/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.log b/tests/cargo-upgrade/workspace_inheritance/stderr.log deleted file mode 100644 index 03abc410c3..0000000000 --- a/tests/cargo-upgrade/workspace_inheritance/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - local: three diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.term.svg b/tests/cargo-upgrade/workspace_inheritance/stderr.term.svg new file mode 100644 index 0000000000..e6b582bb17 --- /dev/null +++ b/tests/cargo-upgrade/workspace_inheritance/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + local: three + + + + + + diff --git a/tests/cargo-upgrade/workspace_inheritance/stdout.log b/tests/cargo-upgrade/workspace_inheritance/stdout.log deleted file mode 100644 index 826feb742c..0000000000 --- a/tests/cargo-upgrade/workspace_inheritance/stdout.log +++ /dev/null @@ -1,3 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_inheritance/stdout.term.svg b/tests/cargo-upgrade/workspace_inheritance/stdout.term.svg new file mode 100644 index 0000000000..97e06bdf47 --- /dev/null +++ b/tests/cargo-upgrade/workspace_inheritance/stdout.term.svg @@ -0,0 +1,29 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_cwd/mod.rs b/tests/cargo-upgrade/workspace_member_cwd/mod.rs index a4fe4e0e43..e8cbb1f9e6 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/mod.rs +++ b/tests/cargo-upgrade/workspace_member_cwd/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("one"); @@ -18,8 +19,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock b/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock index cd11e50ad0..2b59bda009 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock +++ b/tests/cargo-upgrade/workspace_member_cwd/out/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ name = "my-package" version = "99999.0.0+my-package" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c45acf9e11d2f97f5b318143219c0b4102eafef1c22a4b545b47104691d915" +checksum = "73cfa03cf28feb001362b377a837910c5a6ec1cc5cceaa562b97fc14d15edec8" [[package]] name = "one" diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log deleted file mode 100644 index 829a5b3842..0000000000 --- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - excluded: three diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg b/tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg new file mode 100644 index 0000000000..bace652a43 --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + excluded: three + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_cwd/stdout.log b/tests/cargo-upgrade/workspace_member_cwd/stdout.log deleted file mode 100644 index 2972c562ff..0000000000 --- a/tests/cargo-upgrade/workspace_member_cwd/stdout.log +++ /dev/null @@ -1,12 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg b/tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg new file mode 100644 index 0000000000..5e46dde1ca --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_cwd/stdout.term.svg @@ -0,0 +1,47 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.1.1 0.1.1 99999.0.0 99999.0.0 + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs index da5588f09a..dc75cab38a 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs +++ b/tests/cargo-upgrade/workspace_member_manifest_path/mod.rs @@ -1,14 +1,15 @@ use cargo_test_support::compare::assert_ui; +use cargo_test_support::file; use cargo_test_support::Project; use crate::init_registry; use crate::CargoCommand; -use cargo_test_support::curr_dir; +use cargo_test_support::current_dir; #[cargo_test] fn case() { init_registry(); - let project = Project::from_template(curr_dir!().join("in")); + let project = Project::from_template(current_dir!().join("in")); let project_root = project.root(); let cwd = project_root.join("one"); @@ -24,8 +25,8 @@ fn case() { .current_dir(cwd) .assert() .success() - .stdout_matches_path(curr_dir!().join("stdout.log")) - .stderr_matches_path(curr_dir!().join("stderr.log")); + .stdout_eq(file!["stdout.term.svg"]) + .stderr_eq(file!["stderr.term.svg"]); - assert_ui().subset_matches(curr_dir!().join("out"), &project_root); + assert_ui().subset_matches(current_dir!().join("out"), &project_root); } diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log deleted file mode 100644 index 829a5b3842..0000000000 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +++ /dev/null @@ -1,11 +0,0 @@ - Checking virtual workspace's dependencies - Checking four's dependencies - Checking one's dependencies - Checking three's dependencies - Checking two's dependencies - Upgrading recursive dependencies -warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` -note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` - Locking 0 packages to latest compatible versions -note: Re-run with `--verbose` to show more dependencies - excluded: three diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg new file mode 100644 index 0000000000..bace652a43 --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.term.svg @@ -0,0 +1,41 @@ + + + + + + + Checking virtual workspace's dependencies + + Checking four's dependencies + + Checking one's dependencies + + Checking three's dependencies + + Checking two's dependencies + + Upgrading recursive dependencies + + Locking 0 packages to latest compatible versions + + note: Re-run with `--verbose` to show more dependencies + + excluded: three + + + + + + diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stdout.log b/tests/cargo-upgrade/workspace_member_manifest_path/stdout.log deleted file mode 100644 index fed12bf6af..0000000000 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stdout.log +++ /dev/null @@ -1,12 +0,0 @@ -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 -name old req compatible latest new req -==== ======= ========== ====== ======= -my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg b/tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg new file mode 100644 index 0000000000..a516c67145 --- /dev/null +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stdout.term.svg @@ -0,0 +1,47 @@ + + + + + + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + name old req compatible latest new req + + ==== ======= ========== ====== ======= + + my-package 0.2.0 0.2.3 99999.0.0 99999.0.0 + + + + + + From b2bfa2031e2e3e4e6aaf12d67750f0e0fd67f873 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 16 Sep 2024 16:48:01 -0500 Subject: [PATCH 8/8] chore(ci): Speed up by only test stable for PRs --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e09acf951b..1d1539671c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - toolchain: [stable, beta, nightly] + toolchain: [stable] steps: - name: Install latest nightly uses: actions-rs/toolchain@v1