itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(resolve): Generalize term describing updates

Browse Source 
`latest` was easy.  `latest compatible` was ok.  But how do I talk about
"latest compatible with your MSRV".  That gets messy.
This commit is contained in:
Ed Page 2024-08-30 09:26:56 -05:00
parent e14f690e6e
commit ded3f004a4
36 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cargo/ops/cargo_update.rs
View File

@ -765,7 +765,7 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
{
let warn = style::WARN;
let version = summary.version();
let report = format!(" {warn}(latest compatible: v{version}){warn:#}");
let report = format!(" {warn}(available: v{version}){warn:#}");
return Some(report);
}
@ -781,7 +781,7 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
style::WARN
};
let version = summary.version();
let report = format!(" {warn}(latest: v{version}){warn:#}");
let report = format!(" {warn}(available: v{version}){warn:#}");
return Some(report);
}

2
tests/testsuite/cargo_add/default_features/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/list_features_path/stderr.term.svg
View File

@ -37,7 +37,7 @@
</tspan>
<tspan x="10px" y="154px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest compatible version</tspan>
</tspan>
<tspan x="10px" y="172px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="172px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="190px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg
View File

@ -37,7 +37,7 @@
</tspan>
<tspan x="10px" y="154px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest compatible version</tspan>
</tspan>
<tspan x="10px" y="172px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="172px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="190px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
tests/testsuite/cargo_add/namever/stderr.term.svg
View File

@ -30,7 +30,7 @@
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-green bold"> Locking</tspan><tspan> 3 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="118px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.2.3+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="118px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.2.3+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="136px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
tests/testsuite/cargo_add/no_default_features/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

4
tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg
View File

@ -1,4 +1,4 @@
<svg width="844px" height="128px" xmlns="http://www.w3.org/2000/svg">
<svg width="869px" height="128px" xmlns="http://www.w3.org/2000/svg">
<style>
.fg { fill: #AAAAAA }
.bg { background: #000000 }
@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest compatible version</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> cargo-list-test-fixture-dependency v20.0.0+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> cargo-list-test-fixture-dependency v20.0.0+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg
View File

@ -26,7 +26,7 @@
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="100px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg
View File

@ -26,7 +26,7 @@
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="100px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest compatible version</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg
View File

@ -26,7 +26,7 @@
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-green bold"> Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="100px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

4
tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg
View File

@ -26,9 +26,9 @@
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-green bold"> Locking</tspan><tspan> 3 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

4
tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg
View File

@ -26,9 +26,9 @@
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-green bold"> Locking</tspan><tspan> 3 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
tests/testsuite/cargo_add/rust_version_older/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest Rust 1.70 compatible version</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> rust-version-user v0.1.0 </tspan><tspan class="fg-yellow bold">(latest: v0.2.1)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> rust-version-user v0.1.0 </tspan><tspan class="fg-yellow bold">(available: v0.2.1)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
tests/testsuite/cargo_add/rustc_latest/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest Rust [..] compatible version</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> rust-version-user v0.1.1 </tspan><tspan class="fg-yellow bold">(latest: v0.2.1)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> rust-version-user v0.1.1 </tspan><tspan class="fg-yellow bold">(available: v0.2.1)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
tests/testsuite/cargo_add/rustc_older/stderr.term.svg
View File

@ -28,7 +28,7 @@
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest Rust [..] compatible version</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> rust-version-user v0.1.1 </tspan><tspan class="fg-yellow bold">(latest: v0.2.1)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> rust-version-user v0.1.1 </tspan><tspan class="fg-yellow bold">(available: v0.2.1)</tspan>
</tspan>
<tspan x="10px" y="118px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

6
tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg
View File

@ -26,11 +26,11 @@
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-green bold"> Locking</tspan><tspan> 4 packages to latest compatible versions</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-build-package1 v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="82px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-build-package1 v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> toml v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> toml v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="118px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(latest: v99999.0.0+my-package)</tspan>
<tspan x="10px" y="118px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> versioned-package v0.1.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>
</tspan>
<tspan x="10px" y="136px">
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

2
tests/testsuite/cargo_info/within_ws_without_lockfile/stderr.term.svg
View File

@ -24,7 +24,7 @@
</tspan>
<tspan x="10px" y="46px"><tspan class="fg-green bold"> Locking</tspan><tspan> 1 package to latest compatible version</tspan>
</tspan>
<tspan x="10px" y="64px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.2.3+my-package </tspan><tspan class="fg-yellow bold">(latest: v0.4.1+my-package)</tspan>
<tspan x="10px" y="64px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package v0.2.3+my-package </tspan><tspan class="fg-yellow bold">(available: v0.4.1+my-package)</tspan>
</tspan>
<tspan x="10px" y="82px"><tspan class="fg-green bold"> Downloading</tspan><tspan> crates ...</tspan>
</tspan>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
tests/testsuite/cfg.rs
View File

@ -145,7 +145,7 @@ fn ignore_version_from_other_platform() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[ADDING] bar v0.1.0 (latest: v0.2.0)
[ADDING] bar v0.1.0 (available: v0.2.0)
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
[CHECKING] bar v0.1.0

4
tests/testsuite/collisions.rs
View File

@ -207,7 +207,7 @@ fn collision_doc_multiple_versions() {
str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 3 packages to latest compatible versions
[ADDING] bar v1.0.0 (latest: v2.0.0)
[ADDING] bar v1.0.0 (available: v2.0.0)
[DOWNLOADING] crates ...
[DOWNLOADED] bar v2.0.0 (registry `dummy-registry`)
[DOWNLOADED] bar v1.0.0 (registry `dummy-registry`)
@ -503,7 +503,7 @@ fn collision_doc_target() {
str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 3 packages to latest compatible versions
[ADDING] bar v1.0.0 (latest: v2.0.0)
[ADDING] bar v1.0.0 (available: v2.0.0)
[DOWNLOADING] crates ...
[DOWNLOADED] orphaned v1.0.0 (registry `dummy-registry`)
[DOWNLOADED] bar v2.0.0 (registry `dummy-registry`)

6
tests/testsuite/direct_minimal_versions.rs
View File

@ -33,7 +33,7 @@ fn simple() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package
[ADDING] dep v1.0.0 (latest compatible: v1.1.0)
[ADDING] dep v1.0.0 (available: v1.1.0)
"#]])
.run();
@ -122,7 +122,7 @@ fn yanked() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package
[ADDING] dep v1.1.0 (latest compatible: v1.2.0)
[ADDING] dep v1.1.0 (available: v1.2.0)
"#]])
.run();
@ -176,7 +176,7 @@ fn indirect() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages
[ADDING] direct v1.0.0 (latest compatible: v1.1.0)
[ADDING] direct v1.0.0 (available: v1.1.0)
"#]])
.run();

2
tests/testsuite/directory.rs
View File

@ -329,7 +329,7 @@ fn multiple() {
p.cargo("check")
.with_stderr_data(str![[r#"
[LOCKING] 1 package to latest compatible version
[ADDING] bar v0.1.0 (latest: v0.2.0)
[ADDING] bar v0.1.0 (available: v0.2.0)
[CHECKING] bar v0.1.0
[CHECKING] foo v0.1.0 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

2
tests/testsuite/install.rs
View File

@ -2514,7 +2514,7 @@ fn self_referential() {
[DOWNLOADED] foo v0.0.2 (registry `dummy-registry`)
[INSTALLING] foo v0.0.2
[LOCKING] 1 package to latest compatible version
[ADDING] foo v0.0.1 (latest: v0.0.2)
[ADDING] foo v0.0.1 (available: v0.0.2)
[DOWNLOADING] crates ...
[DOWNLOADED] foo v0.0.1 (registry `dummy-registry`)
[COMPILING] foo v0.0.1

2
tests/testsuite/minimal_versions.rs
View File

@ -35,7 +35,7 @@ fn minimal_version_cli() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to earliest compatible version
[ADDING] dep v1.0.0 (latest compatible: v1.1.0)
[ADDING] dep v1.0.0 (available: v1.1.0)
"#]])
.run();

8
tests/testsuite/patch.rs
View File

@ -392,7 +392,7 @@ with the dependency requirements. If the patch has a different version from
what is locked in the Cargo.lock file, run `cargo update` to use the new
version. This may also occur with an optional dependency that is not enabled.
[LOCKING] 1 package to latest compatible version
[ADDING] bar v0.1.0 (latest: v0.2.0)
[ADDING] bar v0.1.0 (available: v0.2.0)
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
[CHECKING] bar v0.1.0
@ -469,7 +469,7 @@ with the dependency requirements. If the patch has a different version from
what is locked in the Cargo.lock file, run `cargo update` to use the new
version. This may also occur with an optional dependency that is not enabled.
[LOCKING] 1 package to latest compatible version
[ADDING] bar v0.1.0 (latest: v0.3.0)
[ADDING] bar v0.1.0 (available: v0.3.0)
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
[CHECKING] bar v0.1.0
@ -568,7 +568,7 @@ with the dependency requirements. If the patch has a different version from
what is locked in the Cargo.lock file, run `cargo update` to use the new
version. This may also occur with an optional dependency that is not enabled.
[LOCKING] 1 package to latest compatible version
[ADDING] bar v0.1.0 (latest: v0.2.0)
[ADDING] bar v0.1.0 (available: v0.2.0)
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
[CHECKING] bar v0.1.0
@ -642,7 +642,7 @@ with the dependency requirements. If the patch has a different version from
what is locked in the Cargo.lock file, run `cargo update` to use the new
version. This may also occur with an optional dependency that is not enabled.
[LOCKING] 1 package to latest compatible version
[ADDING] bar v0.1.0 (latest: v0.2.0)
[ADDING] bar v0.1.0 (available: v0.2.0)
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
[CHECKING] bar v0.1.0

2
tests/testsuite/paths.rs
View File

@ -60,7 +60,7 @@ fn broken_path_override_warns() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[ADDING] bar v0.1.0 (latest: v0.2.0)
[ADDING] bar v0.1.0 (available: v0.2.0)
[WARNING] path override for crate `a` has altered the original list of
dependencies; the dependency on `bar` was either added or
modified to not match the previously resolved version

2
tests/testsuite/registry_overlay.rs
View File

@ -252,7 +252,7 @@ fn registry_dep_depends_on_new_local_package() {
"\
[UPDATING] [..]
[LOCKING] 3 packages to latest compatible versions
[ADDING] workspace-package v0.0.1 (latest: v0.1.1)
[ADDING] workspace-package v0.0.1 (available: v0.1.1)
[DOWNLOADING] crates ...
[UNPACKING] [..]
[DOWNLOADED] [..]

2
tests/testsuite/replace.rs
View File

@ -465,7 +465,7 @@ fn use_a_spec_to_select() {
[UPDATING] `dummy-registry` index
[UPDATING] git repository `[ROOTURL]/override`
[LOCKING] 4 packages to latest compatible versions
[ADDING] baz v0.1.1 (latest: v0.2.0)
[ADDING] baz v0.1.1 (available: v0.2.0)
[DOWNLOADING] crates ...
[DOWNLOADED] baz v0.1.1 (registry `dummy-registry`)
[DOWNLOADED] bar v0.1.1 (registry `dummy-registry`)

16
tests/testsuite/rust_version.rs
View File

@ -242,7 +242,7 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
[ADDING] newer-and-older v1.5.0 (latest compatible: v1.6.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.65.0)
"#]])
@ -319,7 +319,7 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
[ADDING] newer-and-older v1.5.0 (latest compatible: v1.6.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.2345)
"#]])
@ -490,7 +490,7 @@ higher v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.50.0 compatible versions
[ADDING] newer-and-older v1.5.0 (latest compatible: v1.6.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.65.0)
"#]])
@ -619,7 +619,7 @@ fn resolve_edition2024() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
[ADDING] newer-and-older v1.5.0 (latest compatible: v1.6.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.65.0)
"#]])
@ -723,7 +723,7 @@ fn resolve_v3() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
[ADDING] newer-and-older v1.5.0 (latest compatible: v1.6.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.65.0)
"#]])
@ -871,7 +871,7 @@ fn update_msrv_resolve() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest Rust 1.60.0 compatible version
[ADDING] bar v1.5.0 (latest compatible: v1.6.0)
[ADDING] bar v1.5.0 (available: v1.6.0)
"#]])
.run();
@ -932,7 +932,7 @@ fn update_precise_overrides_msrv_resolver() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest Rust 1.60.0 compatible version
[ADDING] bar v1.5.0 (latest compatible: v1.6.0)
[ADDING] bar v1.5.0 (available: v1.6.0)
"#]])
.run();
@ -1019,7 +1019,7 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
[ADDING] newer-and-older v1.5.0 (latest compatible: v1.6.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.65.0)
[DOWNLOADING] crates ...
[DOWNLOADED] newer-and-older v1.5.0 (registry `dummy-registry`)

2
tests/testsuite/tree.rs
View File

@ -1625,7 +1625,7 @@ fn ambiguous_name() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 3 packages to latest compatible versions
[ADDING] dep v1.0.0 (latest: v2.0.0)
[ADDING] dep v1.0.0 (available: v2.0.0)
[DOWNLOADING] crates ...
[DOWNLOADED] dep v2.0.0 (registry `dummy-registry`)
[DOWNLOADED] dep v1.0.0 (registry `dummy-registry`)

26
tests/testsuite/update.rs
View File

@ -1522,7 +1522,7 @@ fn report_behind() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[UPDATING] breaking v0.1.0 -> v0.1.1 (latest: v0.2.0)
[UPDATING] breaking v0.1.0 -> v0.1.1 (available: v0.2.0)
[NOTE] pass `--verbose` to see 2 unchanged dependencies behind latest
[WARNING] not updating lockfile due to dry run
@ -1533,9 +1533,9 @@ fn report_behind() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[UPDATING] breaking v0.1.0 -> v0.1.1 (latest: v0.2.0)
[UNCHANGED] pre v1.0.0-alpha.0 (latest compatible: v1.0.0-alpha.1)
[UNCHANGED] two-ver v0.1.0 (latest: v0.2.0)
[UPDATING] breaking v0.1.0 -> v0.1.1 (available: v0.2.0)
[UNCHANGED] pre v1.0.0-alpha.0 (available: v1.0.0-alpha.1)
[UNCHANGED] two-ver v0.1.0 (available: v0.2.0)
[NOTE] to see how you depend on a package, run `cargo tree --invert --package <dep>@<ver>`
[WARNING] not updating lockfile due to dry run
@ -1558,9 +1558,9 @@ fn report_behind() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 0 packages to latest compatible versions
[UNCHANGED] breaking v0.1.1 (latest: v0.2.0)
[UNCHANGED] pre v1.0.0-alpha.0 (latest compatible: v1.0.0-alpha.1)
[UNCHANGED] two-ver v0.1.0 (latest: v0.2.0)
[UNCHANGED] breaking v0.1.1 (available: v0.2.0)
[UNCHANGED] pre v1.0.0-alpha.0 (available: v1.0.0-alpha.1)
[UNCHANGED] two-ver v0.1.0 (available: v0.2.0)
[NOTE] to see how you depend on a package, run `cargo tree --invert --package <dep>@<ver>`
[WARNING] not updating lockfile due to dry run
@ -2008,8 +2008,8 @@ fn update_breaking() {
[LOCKING] 4 packages to latest compatible versions
[UPDATING] compatible v1.0.0 -> v1.0.1
[UPDATING] less-than v1.0.0 -> v2.0.0
[UPDATING] pinned v1.0.0 -> v1.0.1 (latest: v2.0.0)
[UPDATING] renamed-from v1.0.0 -> v1.0.1 (latest: v2.0.0)
[UPDATING] pinned v1.0.0 -> v1.0.1 (available: v2.0.0)
[UPDATING] renamed-from v1.0.0 -> v1.0.1 (available: v2.0.0)
"#]])
.run();
@ -2180,10 +2180,10 @@ fn update_breaking_specific_packages_that_wont_update() {
[UPDATING] `[..]` index
[LOCKING] 5 packages to latest compatible versions
[UPDATING] compatible v1.0.0 -> v1.0.1
[UPDATING] non-semver v1.0.0 -> v1.0.1 (latest: v2.0.0)
[UPDATING] renamed-from v1.0.0 -> v1.0.1 (latest: v2.0.0)
[UPDATING] non-semver v1.0.0 -> v1.0.1 (available: v2.0.0)
[UPDATING] renamed-from v1.0.0 -> v1.0.1 (available: v2.0.0)
[UPDATING] transitive-compatible v1.0.0 -> v1.0.1
[UPDATING] transitive-incompatible v1.0.0 -> v1.0.1 (latest: v2.0.0)
[UPDATING] transitive-incompatible v1.0.0 -> v1.0.1 (available: v2.0.0)
"#]])
.run();
@ -2397,7 +2397,7 @@ fn update_breaking_spec_version_transitive() {
.with_stderr_data(str![[r#"
[UPDATING] `[..]` index
[LOCKING] 1 package to latest compatible version
[UPDATING] dep v1.1.0 -> v1.1.1 (latest: v2.0.0)
[UPDATING] dep v1.1.0 -> v1.1.1 (available: v2.0.0)
"#]])
.run();

2
tests/testsuite/workspaces.rs
View File

@ -697,7 +697,7 @@ fn share_dependencies() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 1 package to latest compatible version
[ADDING] dep1 v0.1.3 (latest compatible: v0.1.8)
[ADDING] dep1 v0.1.3 (available: v0.1.8)
[DOWNLOADING] crates ...
[DOWNLOADED] dep1 v0.1.3 (registry `dummy-registry`)
[CHECKING] dep1 v0.1.3