Don't downgrade on prerelease `VersionReq` when update with --breaking. #14250

linyihai · 2024-07-15T10:29:36Z

What does this PR try to resolve?

Do nothing with prerelease when update with --breaking.

Fixes #14178

How should we test and review this PR?

Previous commit add a test, next commit to fix and update.

Additional information

rustbot · 2024-07-15T10:29:40Z

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

src/cargo/util/toml_mut/upgrade.rs

epage · 2024-07-18T15:14:24Z

CC @torhovland

I feel like one of your PRs had touched on this already but we wanted to split it out for focusing the reviews, or am I thinking of something else?

torhovland · 2024-07-19T08:34:06Z

CC @torhovland

I feel like one of your PRs had touched on this already but we wanted to split it out for focusing the reviews, or am I thinking of something else?

I think these are separate issues. This one here is about update --breaking not respecting that the user already has a higher pre-release installed, thus trying to "upgrade" to a lower version.

The one I have encountered is about a precise version req not matching its exact version if it is a pre-release. See de1a4a2

linyihai · 2024-07-20T11:15:23Z

I copied the matches_greater from semver to make sure prerelease VersionReq won't downgrade.

tests/testsuite/update.rs

src/cargo/util/toml_mut/upgrade.rs

weihanglo · 2024-07-22T16:07:42Z

tests/testsuite/update.rs

@@ -2616,3 +2616,39 @@ fn update_breaking_mixed_pinning_renaming() {
            "#]],
    );
 }
+
+#[cargo_test]
+fn update_breaking_pre_release() {


From https://github.com/rust-lang/cargo/pull/14250/files#r1680348122:

The update --breaking had filtered the prerelease version to update to. So here equals to no upgrade to prerelease also. :/

Since that is the case, we might want to have UI tests for

2.0.0-beta.22 is available, but 2.0.0-beta.21 won't upgrade to it.

2.0.0 is available, but 2.0.0-beta.21 won't upgrade to it.

3.0.0 is available, and 2.0.0-beta.21 will upgrade to it.

We should document the first two as an unresolved issue. That is something we want to support, especially the second one.

Added update_breaking_pre_release_upgrade to reflect the current behavior.

2.0.0 is available, but 2.0.0-beta.21 won't upgrade to it.

This case out of my expection, it seems need to support.

Task added: #12425 (comment).

…ease

weihanglo · 2024-07-24T18:51:14Z

While there are still some edge cases having to be supported, we shouldn't block this from fixing wrong downgrades. Thank you for the contribution!

@bors r+

bors · 2024-07-24T18:51:17Z

📌 Commit 9e2701a has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-07-24T19:09:08Z

⌛ Testing commit 9e2701a with merge a7917fd...

bors · 2024-07-24T19:39:05Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing a7917fd to master...

Update cargo 14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730 2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000 - Package workspaces (rust-lang/cargo#13947) - test: migrate messages to snapbox (rust-lang/cargo#14242) - chore: Update dependencies (rust-lang/cargo#14299) - fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302) - Misc test clean up (rust-lang/cargo#14297) - Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250) - test: Migrate some json tests to snapbox (rust-lang/cargo#14293) - Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295) - chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286) - Bump to 0.83.0; update changelog (rust-lang/cargo#14285) - Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279) - docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272) - test: Fix some test based on rustc version (rust-lang/cargo#14282) - Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273) r? ghost

rustbot assigned weihanglo Jul 15, 2024

rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2024

linyihai force-pushed the update-breaking-prerelease branch from e3aab3a to 066d0fb Compare July 15, 2024 10:31

linyihai changed the title ~~Update breaking prerelease~~ Do nothing with prerelease when update with --breaking. Jul 15, 2024

weihanglo reviewed Jul 16, 2024

View reviewed changes

src/cargo/util/toml_mut/upgrade.rs Show resolved Hide resolved

src/cargo/util/toml_mut/upgrade.rs Outdated Show resolved Hide resolved

linyihai force-pushed the update-breaking-prerelease branch from 066d0fb to 3973d78 Compare July 17, 2024 01:48

This comment was marked as outdated.

Sign in to view

linyihai marked this pull request as draft July 17, 2024 01:53

linyihai force-pushed the update-breaking-prerelease branch from 3973d78 to 7bbb671 Compare July 17, 2024 02:28

linyihai marked this pull request as ready for review July 17, 2024 02:28

This comment was marked as outdated.

Sign in to view

weihanglo reviewed Jul 18, 2024

View reviewed changes

src/cargo/util/toml_mut/upgrade.rs Outdated Show resolved Hide resolved

linyihai force-pushed the update-breaking-prerelease branch 2 times, most recently from 99951d6 to 0bd64aa Compare July 20, 2024 11:09

linyihai changed the title ~~Do nothing with prerelease when update with --breaking.~~ Don't downgrade on prerelease VersionReq when update with --breaking. Jul 20, 2024

torhovland reviewed Jul 21, 2024

View reviewed changes

tests/testsuite/update.rs Show resolved Hide resolved

linyihai force-pushed the update-breaking-prerelease branch from 0bd64aa to 1891c40 Compare July 22, 2024 03:22

weihanglo reviewed Jul 22, 2024

View reviewed changes

linyihai force-pushed the update-breaking-prerelease branch from 1891c40 to bc38ae0 Compare July 23, 2024 06:21

linyihai added 2 commits July 23, 2024 14:38

test: Add test about update --breaking on prerelease

89b0119

fix: Don't downgrade with update --breaking if VersionReq is prerel…

9e2701a

…ease

linyihai force-pushed the update-breaking-prerelease branch from bc38ae0 to 9e2701a Compare July 23, 2024 06:38

weihanglo approved these changes Jul 24, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2024

bors merged commit a7917fd into rust-lang:master Jul 24, 2024
22 checks passed

weihanglo mentioned this pull request Jul 24, 2024

A way for users to bulk upgrade across incompatible versions #12425

Open

11 tasks

linyihai deleted the update-breaking-prerelease branch July 25, 2024 01:02

weihanglo mentioned this pull request Jul 27, 2024

Update cargo rust-lang/rust#128270

Merged

rustbot added this to the 1.82.0 milestone Jul 28, 2024

linyihai mentioned this pull request Aug 8, 2024

cargo update --breaking doesn't respect pre release #14178

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't downgrade on prerelease `VersionReq` when update with --breaking. #14250

Don't downgrade on prerelease `VersionReq` when update with --breaking. #14250

linyihai commented Jul 15, 2024

rustbot commented Jul 15, 2024

This comment was marked as outdated.

This comment was marked as outdated.

epage commented Jul 18, 2024

torhovland commented Jul 19, 2024

linyihai commented Jul 20, 2024

weihanglo Jul 22, 2024

linyihai Jul 23, 2024

weihanglo Jul 24, 2024

weihanglo commented Jul 24, 2024

bors commented Jul 24, 2024

bors commented Jul 24, 2024

bors commented Jul 24, 2024

Don't downgrade on prerelease VersionReq when update with --breaking. #14250

Don't downgrade on prerelease VersionReq when update with --breaking. #14250

Conversation

linyihai commented Jul 15, 2024

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Jul 15, 2024

This comment was marked as outdated.

This comment was marked as outdated.

epage commented Jul 18, 2024

torhovland commented Jul 19, 2024

linyihai commented Jul 20, 2024

weihanglo Jul 22, 2024

Choose a reason for hiding this comment

linyihai Jul 23, 2024

Choose a reason for hiding this comment

weihanglo Jul 24, 2024

Choose a reason for hiding this comment

weihanglo commented Jul 24, 2024

bors commented Jul 24, 2024

bors commented Jul 24, 2024

bors commented Jul 24, 2024

Don't downgrade on prerelease `VersionReq` when update with --breaking. #14250

Don't downgrade on prerelease `VersionReq` when update with --breaking. #14250