Allow precise update to prerelease. #13626

linyihai · 2024-03-22T12:19:41Z

What does this PR try to resolve?

This is a feature that attempts to support updates to pre-release versions via cargo update --precise.

when precise-pre-release used, the prerelase version will be taking consider as compatible version. That said, we can update to any compatible pre-release version. The logic of checking the compatibility of pre-release versions is currently tentative and does not take many conditions into account, this part of the logic makes more sense when implemented in semver.

Use -Zunstable-options instead of -Zprecise-pre-release.

How should we test and review this PR?

Additional information

Part of #13290

rustbot · 2024-03-22T12:19:45Z

r? @epage

rustbot has assigned @epage.
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

Eh2406 · 2024-03-23T02:36:20Z

I don't think I will be able to give this the attention it deserves until well after Rust Nation. But from a quick perusal it looks like a really good start. Thank you!

weihanglo

Thanks for this patch!

src/cargo/sources/registry/mod.rs

weihanglo · 2024-03-23T13:32:30Z

Do we have tests for checking the feature gate work and doesn't leak on stable? Like prerelease would not be selected without the flag. We may already have. Need to check.

weihanglo · 2024-03-23T18:51:17Z

This --precise <prerelease> is pretty much similar to --precise <yanked>. This make me wonder if we want just overload -Zunstable-options for these two purpose instead of a separate -Zprecise-pre-release unstable flag.

epage · 2024-03-25T18:54:30Z

This --precise is pretty much similar to --precise . This make me wonder if we want just overload -Zunstable-options for these two purpose instead of a separate -Zprecise-pre-release unstable flag.

That had been my expectation

linyihai · 2024-03-26T11:32:21Z

This --precise <prerelease> is pretty much similar to --precise <yanked>. This make me wonder if we want just overload -Zunstable-options for these two purpose instead of a separate -Zprecise-pre-release unstable flag.

I already changed it by the way.

weihanglo

Thanks for this!

Could we also have a doc update as well?

weihanglo · 2024-04-02T18:49:43Z

src/doc/man/cargo-update.md

@@ -46,6 +46,9 @@ revision (such as a SHA hash or tag).
 While not recommended, you can specify a yanked version of a package (nightly only).
 When possible, try other non-yanked SemVer-compatible versions or seek help
 from the maintainers of the package.
+
+It's allows you choose any compatible `pre-release` version (nightly only) even when a pre-release is not specified by a projects `Cargo.toml`.


Suggested change

It's allows you choose any compatible `pre-release` version (nightly only) even when a pre-release is not specified by a projects `Cargo.toml`.

A compatible `pre-release` version can also be specified even when the version requirement in `Cargo.toml` doesn't contain any pre-release identifer (nightly only).

Good annotations have always been my weakness, thank you for correcting this description.

tests/testsuite/precise_pre_release.rs

weihanglo · 2024-04-02T19:42:57Z

src/cargo/sources/registry/mod.rs

+            .filter(|(c, _)| {
+                if self.gctx.cli_unstable().unstable_options {


I don't know how match_prerelease will evolve, so it's better to have a check here maybe?

Suggested change

.filter(|(c, _)| {

if self.gctx.cli_unstable().unstable_options {

.filter(|(c, to)| {

if to.is_prerelease() && self.gctx.cli_unstable().unstable_options {

Your concern makes sense.

weihanglo · 2024-04-02T19:46:20Z

src/cargo/sources/registry/mod.rs

@@ -790,7 +796,13 @@ impl<'gctx> Source for RegistrySource<'gctx> {
                .index
                .query_inner(dep.package_name(), &req, &mut *self.ops, &mut |s| {
                    let matched = match kind {
-                        QueryKind::Exact => dep.matches(s.as_summary()),
+                        QueryKind::Exact => {
+                            if self.gctx.cli_unstable().unstable_options {


Same here. We might want this check to prevent any regression in the future, if some underlying functions change.

Suggested change

if self.gctx.cli_unstable().unstable_options {

if req.is_precise() && self.gctx.cli_unstable().unstable_options {

weihanglo

Thanks. The only missing piece is updating the unstable doc here to -Zunstable-options:

cargo/src/doc/src/reference/unstable.md

Line 350 in f4ea1d1

    
           It's possible to update `my-dependancy` to a pre-release with `update -Zprecise-pre-release -p my-dependency --precise 0.1.2-pre.0`.

weihanglo · 2024-04-03T15:43:00Z

Thanks!

@bors r+

bors · 2024-04-03T15:43:03Z

📌 Commit 179f2f1 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-04-03T15:44:11Z

⌛ Testing commit 179f2f1 with merge 6774b85...

bors · 2024-04-03T16:13:23Z

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

Update cargo 9 commits in 0637083df5bbdcc951845f0d2eff6999cdb6d30a..28e7b2bc0a812f90126be30f48a00a4ada990eaa 2024-04-02 23:55:05 +0000 to 2024-04-05 19:31:01 +0000 - refactor(toml): Decouple target discovery from Target creation (rust-lang/cargo#13701) - Don't depend on `?` affecting type inference in weird ways (rust-lang/cargo#13706) - test(metadata): Show behavior with TOML-specific types (rust-lang/cargo#13703) - fix: adjust tracing verbosity in list_files_git (rust-lang/cargo#13704) - doc: comments on `PackageRegistry` (rust-lang/cargo#13698) - Switch to using gitoxide by default for listing files (rust-lang/cargo#13696) - Allow precise update to prerelease. (rust-lang/cargo#13626) - refactor(toml): Split out an explicit step to resolve `Cargo.toml` (rust-lang/cargo#13693) - chore(deps): update rust crate base64 to 0.22.0 (rust-lang/cargo#13675) r? ghost

rustbot assigned epage Mar 22, 2024

rustbot added A-crate-dependencies Area: [dependencies] of any kind A-registries Area: registries A-semver Area: semver specifications, version matching, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2024

linyihai force-pushed the pre-update branch from 6e80de3 to 0683dfc Compare March 22, 2024 12:32

weihanglo reviewed Mar 23, 2024

View reviewed changes

src/cargo/sources/registry/mod.rs Outdated Show resolved Hide resolved

src/cargo/sources/registry/mod.rs Outdated Show resolved Hide resolved

linyihai force-pushed the pre-update branch from 0683dfc to e9e30fc Compare March 26, 2024 11:26

rustbot added A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation A-unstable Area: nightly unstable support labels Mar 26, 2024

weihanglo reviewed Apr 2, 2024

View reviewed changes

linyihai force-pushed the pre-update branch from e9e30fc to 9b325d0 Compare April 3, 2024 02:46

weihanglo approved these changes Apr 3, 2024

View reviewed changes

Allow precise update to prerelease.

179f2f1

linyihai force-pushed the pre-update branch from 9b325d0 to 179f2f1 Compare April 3, 2024 14:46

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 Apr 3, 2024

weihanglo mentioned this pull request Apr 3, 2024

Tracking Issue for update --precise with pre-release #13290

Open

2 tasks

bors merged commit 6774b85 into rust-lang:master Apr 3, 2024
21 checks passed

weihanglo mentioned this pull request Apr 6, 2024

Update cargo rust-lang/rust#123527

Merged

rustbot added this to the 1.79.0 milestone Apr 6, 2024

linyihai mentioned this pull request Jul 26, 2024

Add capability of making breaking changes in update --precise #14140

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow precise update to prerelease. #13626

Allow precise update to prerelease. #13626

linyihai commented Mar 22, 2024 •

edited

Loading

rustbot commented Mar 22, 2024

Eh2406 commented Mar 23, 2024

weihanglo left a comment

weihanglo commented Mar 23, 2024 •

edited

Loading

weihanglo commented Mar 23, 2024

epage commented Mar 25, 2024

linyihai commented Mar 26, 2024

weihanglo left a comment

weihanglo Apr 2, 2024

linyihai Apr 3, 2024

weihanglo Apr 2, 2024

linyihai Apr 3, 2024

weihanglo Apr 2, 2024

weihanglo left a comment

weihanglo commented Apr 3, 2024

bors commented Apr 3, 2024

bors commented Apr 3, 2024

bors commented Apr 3, 2024

	It's allows you choose any compatible `pre-release` version (nightly only) even when a pre-release is not specified by a projects `Cargo.toml`.
	A compatible `pre-release` version can also be specified even when the version requirement in `Cargo.toml` doesn't contain any pre-release identifer (nightly only).

		.filter(\|(c, _)\| {
		if self.gctx.cli_unstable().unstable_options {

	if self.gctx.cli_unstable().unstable_options {
	if req.is_precise() && self.gctx.cli_unstable().unstable_options {

Allow precise update to prerelease. #13626

Allow precise update to prerelease. #13626

Conversation

linyihai commented Mar 22, 2024 • edited Loading

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Mar 22, 2024

Eh2406 commented Mar 23, 2024

weihanglo left a comment

Choose a reason for hiding this comment

weihanglo commented Mar 23, 2024 • edited Loading

weihanglo commented Mar 23, 2024

epage commented Mar 25, 2024

linyihai commented Mar 26, 2024

weihanglo left a comment

Choose a reason for hiding this comment

weihanglo Apr 2, 2024

Choose a reason for hiding this comment

linyihai Apr 3, 2024

Choose a reason for hiding this comment

weihanglo Apr 2, 2024

Choose a reason for hiding this comment

linyihai Apr 3, 2024

Choose a reason for hiding this comment

weihanglo Apr 2, 2024

Choose a reason for hiding this comment

weihanglo left a comment

Choose a reason for hiding this comment

weihanglo commented Apr 3, 2024

bors commented Apr 3, 2024

bors commented Apr 3, 2024

bors commented Apr 3, 2024

linyihai commented Mar 22, 2024 •

edited

Loading

weihanglo commented Mar 23, 2024 •

edited

Loading