Skip to content

Commit cefde40

Browse files
committed
fix(resolve): Generalize term describing updates
`latest` was easy. `latest compatible` was ok. But how do I talk about "latest compatible with your MSRV". That gets messy.
1 parent e14f690 commit cefde40

File tree

36 files changed

+66
-66
lines changed

36 files changed

+66
-66
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
765765
{
766766
let warn = style::WARN;
767767
let version = summary.version();
768-
let report = format!(" {warn}(latest compatible: v{version}){warn:#}");
768+
let report = format!(" {warn}(available: v{version}){warn:#}");
769769
return Some(report);
770770
}
771771

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

tests/testsuite/cargo_add/default_features/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/list_features_path/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/namever/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/no_default_features/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg

Lines changed: 2 additions & 2 deletions
Loading

tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg

Lines changed: 2 additions & 2 deletions
Loading

tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg

Lines changed: 2 additions & 2 deletions
Loading

tests/testsuite/cargo_add/rust_version_older/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/rustc_latest/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/rustc_older/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg

Lines changed: 3 additions & 3 deletions
Loading

tests/testsuite/cargo_info/within_ws_without_lockfile/stderr.term.svg

Lines changed: 1 addition & 1 deletion
Loading

tests/testsuite/cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ fn ignore_version_from_other_platform() {
145145
.with_stderr_data(str![[r#"
146146
[UPDATING] `dummy-registry` index
147147
[LOCKING] 2 packages to latest compatible versions
148-
[ADDING] bar v0.1.0 (latest: v0.2.0)
148+
[ADDING] bar v0.1.0 (available: v0.2.0)
149149
[DOWNLOADING] crates ...
150150
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
151151
[CHECKING] bar v0.1.0

tests/testsuite/collisions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ fn collision_doc_multiple_versions() {
207207
str![[r#"
208208
[UPDATING] `dummy-registry` index
209209
[LOCKING] 3 packages to latest compatible versions
210-
[ADDING] bar v1.0.0 (latest: v2.0.0)
210+
[ADDING] bar v1.0.0 (available: v2.0.0)
211211
[DOWNLOADING] crates ...
212212
[DOWNLOADED] bar v2.0.0 (registry `dummy-registry`)
213213
[DOWNLOADED] bar v1.0.0 (registry `dummy-registry`)

tests/testsuite/direct_minimal_versions.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn simple() {
3333
.with_stderr_data(str![[r#"
3434
[UPDATING] `dummy-registry` index
3535
[LOCKING] 1 package
36-
[ADDING] dep v1.0.0 (latest compatible: v1.1.0)
36+
[ADDING] dep v1.0.0 (available: v1.1.0)
3737
3838
"#]])
3939
.run();
@@ -122,7 +122,7 @@ fn yanked() {
122122
.with_stderr_data(str![[r#"
123123
[UPDATING] `dummy-registry` index
124124
[LOCKING] 1 package
125-
[ADDING] dep v1.1.0 (latest compatible: v1.2.0)
125+
[ADDING] dep v1.1.0 (available: v1.2.0)
126126
127127
"#]])
128128
.run();
@@ -176,7 +176,7 @@ fn indirect() {
176176
.with_stderr_data(str![[r#"
177177
[UPDATING] `dummy-registry` index
178178
[LOCKING] 2 packages
179-
[ADDING] direct v1.0.0 (latest compatible: v1.1.0)
179+
[ADDING] direct v1.0.0 (available: v1.1.0)
180180
181181
"#]])
182182
.run();

tests/testsuite/directory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ fn multiple() {
329329
p.cargo("check")
330330
.with_stderr_data(str![[r#"
331331
[LOCKING] 1 package to latest compatible version
332-
[ADDING] bar v0.1.0 (latest: v0.2.0)
332+
[ADDING] bar v0.1.0 (available: v0.2.0)
333333
[CHECKING] bar v0.1.0
334334
[CHECKING] foo v0.1.0 ([ROOT]/foo)
335335
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s

tests/testsuite/install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2514,7 +2514,7 @@ fn self_referential() {
25142514
[DOWNLOADED] foo v0.0.2 (registry `dummy-registry`)
25152515
[INSTALLING] foo v0.0.2
25162516
[LOCKING] 1 package to latest compatible version
2517-
[ADDING] foo v0.0.1 (latest: v0.0.2)
2517+
[ADDING] foo v0.0.1 (available: v0.0.2)
25182518
[DOWNLOADING] crates ...
25192519
[DOWNLOADED] foo v0.0.1 (registry `dummy-registry`)
25202520
[COMPILING] foo v0.0.1

tests/testsuite/minimal_versions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn minimal_version_cli() {
3535
.with_stderr_data(str![[r#"
3636
[UPDATING] `dummy-registry` index
3737
[LOCKING] 1 package to earliest compatible version
38-
[ADDING] dep v1.0.0 (latest compatible: v1.1.0)
38+
[ADDING] dep v1.0.0 (available: v1.1.0)
3939
4040
"#]])
4141
.run();

tests/testsuite/patch.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ with the dependency requirements. If the patch has a different version from
392392
what is locked in the Cargo.lock file, run `cargo update` to use the new
393393
version. This may also occur with an optional dependency that is not enabled.
394394
[LOCKING] 1 package to latest compatible version
395-
[ADDING] bar v0.1.0 (latest: v0.2.0)
395+
[ADDING] bar v0.1.0 (available: v0.2.0)
396396
[DOWNLOADING] crates ...
397397
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
398398
[CHECKING] bar v0.1.0
@@ -469,7 +469,7 @@ with the dependency requirements. If the patch has a different version from
469469
what is locked in the Cargo.lock file, run `cargo update` to use the new
470470
version. This may also occur with an optional dependency that is not enabled.
471471
[LOCKING] 1 package to latest compatible version
472-
[ADDING] bar v0.1.0 (latest: v0.3.0)
472+
[ADDING] bar v0.1.0 (available: v0.3.0)
473473
[DOWNLOADING] crates ...
474474
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
475475
[CHECKING] bar v0.1.0
@@ -568,7 +568,7 @@ with the dependency requirements. If the patch has a different version from
568568
what is locked in the Cargo.lock file, run `cargo update` to use the new
569569
version. This may also occur with an optional dependency that is not enabled.
570570
[LOCKING] 1 package to latest compatible version
571-
[ADDING] bar v0.1.0 (latest: v0.2.0)
571+
[ADDING] bar v0.1.0 (available: v0.2.0)
572572
[DOWNLOADING] crates ...
573573
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
574574
[CHECKING] bar v0.1.0
@@ -642,7 +642,7 @@ with the dependency requirements. If the patch has a different version from
642642
what is locked in the Cargo.lock file, run `cargo update` to use the new
643643
version. This may also occur with an optional dependency that is not enabled.
644644
[LOCKING] 1 package to latest compatible version
645-
[ADDING] bar v0.1.0 (latest: v0.2.0)
645+
[ADDING] bar v0.1.0 (available: v0.2.0)
646646
[DOWNLOADING] crates ...
647647
[DOWNLOADED] bar v0.1.0 (registry `dummy-registry`)
648648
[CHECKING] bar v0.1.0

0 commit comments

Comments
 (0)