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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/book/src/commands/cargo-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ requirement in <code>Cargo.toml</code> doesn’t contain any pre-release identif


<dt class="option-term" id="option-cargo-update---breaking"><a class="option-anchor" href="#option-cargo-update---breaking"><code>--breaking</code> <em>directory</em></a></dt>
<dd class="option-desc"><p>Update <em>spec</em> to latest SemVer-breaking version.</p>
<dd class="option-desc"><p>Update <em>spec</em> to highest SemVer-breaking version.</p>
<p>Version requirements will be modified to allow this update.</p>
<p>This only applies to dependencies when</p>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion doc/man/cargo-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ requirement in `Cargo.toml` doesn't contain any pre-release identifier (nightly
{{/option}}

{{#option "`--breaking` _directory_" }}
Update _spec_ to latest SemVer-breaking version.
Update _spec_ to highest SemVer-breaking version.

Version requirements will be modified to allow this update.

Expand Down
2 changes: 1 addition & 1 deletion doc/man/generated_txt/cargo-update.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ OPTIONS
identifier (nightly only).

--breaking directory
Update spec to latest SemVer-breaking version.
Update spec to highest SemVer-breaking version.

Version requirements will be modified to allow this update.

Expand Down
2 changes: 1 addition & 1 deletion etc/man/cargo-update.1
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requirement in \fBCargo.toml\fR doesn\[cq]t contain any pre\-release identifier
.sp
\fB\-\-breaking\fR \fIdirectory\fR
.RS 4
Update \fIspec\fR to latest SemVer\-breaking version.
Update \fIspec\fR to highest SemVer\-breaking version.
.sp
Version requirements will be modified to allow this update.
.sp
Expand Down
2 changes: 1 addition & 1 deletion src/bin/cargo/commands/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub fn cli() -> Command {
.arg(
flag(
"breaking",
"Update [SPEC] to latest SemVer-breaking version (unstable)",
"Update [SPEC] to highest SemVer-breaking version (unstable)",
)
.short('b'),
)
Expand Down
4 changes: 2 additions & 2 deletions src/ops/cargo_update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,9 @@ fn status_locking(ws: &Workspace<'_>, num_pkgs: usize) -> CargoResult<()> {
if !ws.gctx().cli_unstable().direct_minimal_versions {
write!(&mut cfg, " to")?;
if ws.gctx().cli_unstable().minimal_versions {
write!(&mut cfg, " earliest")?;
write!(&mut cfg, " lowest")?;
} else {
write!(&mut cfg, " latest")?;
write!(&mut cfg, " highest")?;
}

if let Some(rust_version) = required_rust_version(ws) {
Expand Down
20 changes: 10 additions & 10 deletions tests/testsuite/alt_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn depend_on_alt_registry() {
p.cargo("check")
.with_stderr_data(str![[r#"
[UPDATING] `alternative` index
[LOCKING] 1 package to latest compatible version
[LOCKING] 1 package to highest compatible version
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
[CHECKING] bar v0.0.1 (registry `alternative`)
Expand Down Expand Up @@ -90,7 +90,7 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() {
.with_stderr_data(
str![[r#"
[UPDATING] `alternative` index
[LOCKING] 2 packages to latest compatible versions
[LOCKING] 2 packages to highest compatible versions
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
[DOWNLOADED] baz v0.0.1 (registry `alternative`)
Expand Down Expand Up @@ -136,7 +136,7 @@ fn depend_on_alt_registry_depends_on_same_registry() {
.with_stderr_data(
str![[r#"
[UPDATING] `alternative` index
[LOCKING] 2 packages to latest compatible versions
[LOCKING] 2 packages to highest compatible versions
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
[DOWNLOADED] baz v0.0.1 (registry `alternative`)
Expand Down Expand Up @@ -183,7 +183,7 @@ fn depend_on_alt_registry_depends_on_crates_io() {
str![[r#"
[UPDATING] `alternative` index
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[LOCKING] 2 packages to highest compatible versions
[DOWNLOADING] crates ...
[DOWNLOADED] baz v0.0.1 (registry `dummy-registry`)
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
Expand Down Expand Up @@ -224,7 +224,7 @@ fn registry_and_path_dep_works() {

p.cargo("check")
.with_stderr_data(str![[r#"
[LOCKING] 1 package to latest compatible version
[LOCKING] 1 package to highest compatible version
[CHECKING] bar v0.0.1 ([ROOT]/foo/bar)
[CHECKING] foo v0.0.1 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
Expand Down Expand Up @@ -282,7 +282,7 @@ fn registry_and_git_dep_works() {
p.cargo("check")
.with_stderr_data(str![[r#"
[UPDATING] git repository `[ROOTURL]/bar`
[LOCKING] 1 package to latest compatible version
[LOCKING] 1 package to highest compatible version
[CHECKING] bar v0.0.1 ([ROOTURL]/bar#[..])
[CHECKING] foo v0.0.1 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
Expand Down Expand Up @@ -471,7 +471,7 @@ fn alt_registry_and_crates_io_deps() {
str![[r#"
[UPDATING] `alternative` index
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[LOCKING] 2 packages to highest compatible versions
[DOWNLOADING] crates ...
[DOWNLOADED] crates_io_dep v0.0.1 (registry `dummy-registry`)
[DOWNLOADED] alt_reg_dep v0.1.0 (registry `alternative`)
Expand Down Expand Up @@ -847,7 +847,7 @@ fn patch_alt_reg() {
p.cargo("check")
.with_stderr_data(str![[r#"
[UPDATING] `alternative` index
[LOCKING] 1 package to latest compatible version
[LOCKING] 1 package to highest compatible version
[CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
[CHECKING] foo v0.0.1 ([ROOT]/foo)
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
Expand Down Expand Up @@ -937,7 +937,7 @@ fn no_api() {
p.cargo("check")
.with_stderr_data(str![[r#"
[UPDATING] `alternative` index
[LOCKING] 1 package to latest compatible version
[LOCKING] 1 package to highest compatible version
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.0.1 (registry `alternative`)
[CHECKING] bar v0.0.1 (registry `alternative`)
Expand Down Expand Up @@ -1794,7 +1794,7 @@ fn registries_index_relative_url() {
p.cargo("check")
.with_stderr_data(str![[r#"
[UPDATING] `relative` index
[LOCKING] 1 package to latest compatible version
[LOCKING] 1 package to highest compatible version
[DOWNLOADING] crates ...
[DOWNLOADED] bar v0.0.1 (registry `relative`)
[CHECKING] bar v0.0.1 (registry `relative`)
Expand Down
Loading