Update to semver 1.0.0 #9508

dtolnay · 2021-05-26T00:52:34Z

I am working on a 1.0.0 of the semver crate some time this week. It would be good to confirm Cargo will be able to use it, beforehand!

It's a from-scratch rewrite, but dtolnay/semver#237 has code to compare against 0.10.0 (currently used by Cargo) how every possible version requirement currently published to crates.io matches against every possible crate version. The differences are all broken syntax like ^0-.11.0 previously parsing with ".11.0" as a pre-release string (which is invalid, because pre-release are not allowed to contain empty dot-separated identifiers) and ~2.0-2.2 previously parsing with "2.2" as a pre-release string, when the user almost certainly meant >=2.0, <=2.2. I'm not sure how much of those you want to add code into Cargo to preserve behavior, but I would be happy to do it.

rust-highfive · 2021-05-26T00:52:37Z

r? @ehuss

(rust-highfive has picked a reviewer for you, use r? to override)

dtolnay · 2021-05-26T00:53:52Z

src/cargo/core/dependency.rs

+        ".*" => "*",
+        "0.1.0." => "0.1.0",
+        "0.3.1.3" => "0.3.13",
+        "0.2*" => "0.2.*",
+        "*.0" => "*",


These are copied from dtolnay/semver#93.

Thanks for keeping the compat here! That being said the warning below says that it will soon become a hard error, and that was added 5 years ago in #3154. I think it's probably fine to just delete all this at this point (and I'm glad you moved this logic to Cargo from the semver crate itself!)

Good call 😛 I've deleted the compatibility code in 396bdd3.

dtolnay · 2021-05-26T01:01:16Z

src/cargo/core/dependency.rs

-            Some(v) => (true, parse_req_with_deprecated(name, v, arg)?),
-            None => (false, VersionReq::any()),
+            Some(v) => (true, parse_req_with_deprecated(name, v, arg)?.into()),
+            None => (false, OptVersionReq::Any),


"Any" is not considered a VersionReq, because there is no semver syntax that literally matches any version. * is not that, because of how https://github.com/semver/semver/blob/efcff2c838c9945f79bfd21c1df0073271bcc29c/ranges.md suggests handling pre-release versions:

SemVer Versions containing PRERELEASE identifiers MUST NOT be included by a SemVer Comparator Set unless they are included by all of the Comparators in the Comparator Set, and one or more of the following conditions are met:

The implementation has provided the user with an option to explicitly include PRERELEASE versions, and the user has set this option. This SHOULD NOT be the default behavior when resolving software dependencies.

One or more of the Comparators in the Comparator Set have the same MAJOR, MINOR, and PATCH version as the SemVer Version string being considered, and has a PRERELEASE version, and would normally include the SemVer Version string by virtue of precedence comparison.

For example, the Range >=1.0.0-alpha would include the Version 1.0.0-beta but not the Version 1.0.1-beta.

In previous versions of the semver crate, VersionReq::any() would literally mean any, which is different from *, and it would match any version. But upon roundtrip through a string, it would decay to *, because again there is no semver syntax that means "any".

Instead I'm suggesting that Cargo use something effectively like Option<VersionReq> with an absent VersionReq meaning "any", and the equivalent of .map_or(true, |req| req.matches(version)) for matching.

Eh2406 · 2021-05-26T01:06:40Z

Thank you for working on semver!
The brakeage documented in dtolnay/semver#237 is ok by me, but I think will need the consent of the full team.

alexcrichton

Thanks for doing this @dtolnay! This all looks good to me and I would personally be ok merging. We may end up discovering one or two things that are problematic, but that's just a fear of "well things are always weird in the wild". If that comes up we can always figure out how to deal with it. It sounds like you've otherwise handled other known issues, hence me being comfortable landing this.

alexcrichton · 2021-05-26T20:36:11Z

src/cargo/core/dependency.rs

+        ".*" => "*",
+        "0.1.0." => "0.1.0",
+        "0.3.1.3" => "0.3.13",
+        "0.2*" => "0.2.*",
+        "*.0" => "*",


Thanks for keeping the compat here! That being said the warning below says that it will soon become a hard error, and that was added 5 years ago in #3154. I think it's probably fine to just delete all this at this point (and I'm glad you moved this logic to Cargo from the semver crate itself!)

alexcrichton · 2021-05-26T22:14:59Z

@rfcbot fcp merge

👍 thanks again for this @dtolnay!

rfcbot · 2021-05-26T22:14:59Z

Team member @alexcrichton has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

Eh2406 · 2021-05-27T14:19:35Z

From the description of the situation around Any it sounds like a mess. If we need the concept of Any then if feels dangerous to have it change meaning when it is serialized. If we can use * instead then we should.

Also now that a lot more internals of a semver are available we should look at how meny of our hacks can be simplified.

But all of that can be looked at in flow up PR. So I am +1.

rfcbot · 2021-05-27T14:20:10Z

🔔 This is now entering its final comment period, as per the review above. 🔔

ehuss · 2021-05-27T20:44:54Z

Thanks for being so thorough!

Just to be clear, the current crates in the index that will now fail are:

Bad versions:

volatile 0.4.0-alpha.00
volatile 0.4.0-alpha.01
bluetooth_client 0.0.1-001
hxgm30-client 0.3.0-alpha.01

Bad requirements:

lmdb-rkv-sys 0.9.4 -> bindgen ^0.51-oldsyn
raft 0.5.0 -> protobuf ~2.0-2.2
solstice-2d 0.1.2 -> solstice ^0.1-alpha.0
solstice-2d 0.2.0 -> solstice ^0.1-alpha.0
solstice-2d 0.2.1 -> solstice ^0.1-alpha.0
solstice-2d 0.2.2 -> solstice ^0.1-alpha.0
solstice-2d 0.2.3 -> solstice ^0.1-alpha.0
solstice-2d 0.2.5 -> solstice ^0.1-alpha.0
solstice-2d 0.2.6 -> solstice ^0.1-alpha.0
solstice-2d 0.2.7 -> solstice ^0.1-alpha.0
solstice-2d 0.2.8 -> solstice ^0.1-alpha.0
tma 0.1.0 -> error-chain ^0-.11.0
tma 0.1.1 -> error-chain ^0-.11.0

To the best of my knowledge, these entries in the local cache will just cause the cache to be rebuilt. Otherwise, Cargo will behave as-if these releases don't exist.

ehuss · 2021-05-27T20:45:00Z

@bors r+

bors · 2021-05-27T20:45:02Z

📌 Commit 7ace447 has been approved by ehuss

bors · 2021-05-27T20:45:16Z

⌛ Testing commit 7ace447 with merge 7c479d26ca12eccafeb15aa5ae3c5507373236e2...

bors · 2021-05-27T20:57:30Z

💔 Test failed - checks-actions

alexcrichton · 2021-05-27T21:42:05Z

That'll get fixed by #9517, will retry once that merges first.

alexcrichton · 2021-05-27T22:34:24Z

@bors: retry

bors · 2021-05-27T22:34:31Z

⌛ Testing commit 7ace447 with merge 2f3df16...

bors · 2021-05-27T23:00:49Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 2f3df16 to master...

Update cargo 10 commits in e931e4796b61de593aa1097649445e535c9c7ee0..0cecbd67323ca14a7eb6505900d0d7307b00355b 2021-05-24 16:17:27 +0000 to 2021-06-01 20:09:13 +0000 - Configure hosts separately from targets when --target is specified. (rust-lang/cargo#9322) - Add some validation to rustc-link-arg (rust-lang/cargo#9523) - Implement suggestions for unknown features in workspace (rust-lang/cargo#9420) - Extract common `make_dep_path` to cargo_util (rust-lang/cargo#9529) - Add a note about rustflags compatibility. (rust-lang/cargo#9524) - Consolidate doc collision detection. (rust-lang/cargo#9526) - Add `--depth` option for `cargo-tree` (rust-lang/cargo#9499) - `cargo tree -e no-proc-macro` to hide procedural macro dependencies (rust-lang/cargo#9488) - Update to semver 1.0.0 (rust-lang/cargo#9508) - Update tar dependency to 0.4.35 (rust-lang/cargo#9517)

SergioBenitez · 2021-06-04T03:12:29Z

This seems to contain a breaking change where previously version strings like 0.11.x were accepted to mean 0.11.* but now error. See, for instance, https://github.com/Arnavion/derive-error-chain/blob/ed2fafa0354b10df889cf46042651a91a02d58bf/derive-error-chain/Cargo.toml, which is causing a failure in diesel on nightly: diesel-rs/diesel#2797.

Update to semver 1.0.3 Fixes rust-lang/cargo#9508 (comment) by pulling in dtolnay/semver#247. Fixes rust-lang/cargo#9543

Since cargo v1.54, invalid syntax for version requirements is rejected cf) https://github.com/rust-lang/cargo/blob/master/CHANGELOG.md#cargo-154-2021-07-29 rust-lang/cargo#9508 Signed-off-by: Junyeong Jeong <rhdxmr@gmail.com>

Cargo in the latest version upgraded the server dependency (rust-lang/cargo#9508). As a result, it no longer accepts "" as a version. So we now use a specific version of all such usage.

* Fix cargo failures on rust version 1.54 Cargo in the latest version upgraded the server dependency (rust-lang/cargo#9508). As a result, it no longer accepts "" as a version. So we now use a specific version of all such usage. * Fix new clippy warnings new to Rust 1.54

With this, rust-lang/cargo#9508, the dependency can no longer be used. What was picked with 1.53 cargo was ~2.0, so use that instead. Test: verify dependency can now be used

With this, rust-lang/cargo#9508, the dependency can no longer be used. What was picked with 1.53 cargo was ~2.0, so use that instead. Test: verify dependency can now be used Signed-off-by: Jean-Philippe DUFRAIGNE <j.dufraigne@gmail.com>

* Fix cargo failures on rust version 1.54 Cargo in the latest version upgraded the server dependency (rust-lang/cargo#9508). As a result, it no longer accepts "" as a version. So we now use a specific version of all such usage. * Fix new clippy warnings new to Rust 1.54

Update to semver 1.0.0-rc

3b62e46

rust-highfive assigned ehuss May 26, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 26, 2021

dtolnay commented May 26, 2021

View reviewed changes

alexcrichton approved these changes May 26, 2021

View reviewed changes

dtolnay added 2 commits May 26, 2021 14:37

Remove parsing of broken version syntax from 5 years ago

396bdd3

Update to semver 1.0.0

7ace447

dtolnay changed the title ~~Update to semver 1.0.0-rc~~ Update to semver 1.0.0 May 26, 2021

alexcrichton added the T-cargo Team: Cargo label May 26, 2021

rfcbot added proposed-final-comment-period An FCP proposal has started, but not yet signed off. disposition-merge FCP with intent to merge labels May 26, 2021

rfcbot added final-comment-period FCP — a period for last comments before action is taken and removed proposed-final-comment-period An FCP proposal has started, but not yet signed off. labels May 27, 2021

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 May 27, 2021

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

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 May 27, 2021

bors merged commit 2f3df16 into rust-lang:master May 27, 2021

dtolnay deleted the semver branch May 27, 2021 23:19

ehuss mentioned this pull request Jun 2, 2021

Update cargo rust-lang/rust#85926

Merged

dtolnay mentioned this pull request Jun 3, 2021

About "invalid leading zero in pre-release identifier" dtolnay/semver#246

Closed

SergioBenitez mentioned this pull request Jun 4, 2021

1.4.x: Update 'libsqlite3-sys' to 0.22 diesel-rs/diesel#2797

Merged

dtolnay mentioned this pull request Jun 4, 2021

Update to semver 1.0.3 rust-lang/rust#85983

Merged

weiznich mentioned this pull request Jun 4, 2021

Regression in version strings accepted by cargo #9543

Closed

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 4, 2021

Rollup merge of rust-lang#85983 - dtolnay:semverx, r=ehuss

d5c9894

Update to semver 1.0.3 Fixes rust-lang/cargo#9508 (comment) by pulling in dtolnay/semver#247. Fixes rust-lang/cargo#9543

rfcbot added finished-final-comment-period FCP complete to-announce and removed final-comment-period FCP — a period for last comments before action is taken labels Jun 6, 2021

rhdxmr mentioned this pull request Jul 17, 2021

Fix dependency versions at Cargo.toml of examples foniod/redbpf#156

Merged

ramnivas mentioned this pull request Jul 29, 2021

Fix cargo failures on rust version 1.54 exograph/exograph#133

Merged

jeanphilippeD mentioned this pull request Aug 2, 2021

Fix protobuf dependency invalid semver for cargo 1.54 for v0.5.x tikv/raft-rs#451

Open

ehuss added this to the 1.54.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to semver 1.0.0 #9508

Update to semver 1.0.0 #9508

dtolnay commented May 26, 2021

rust-highfive commented May 26, 2021

dtolnay May 26, 2021

alexcrichton May 26, 2021

dtolnay May 26, 2021

dtolnay May 26, 2021 •

edited

Loading

Eh2406 commented May 26, 2021

alexcrichton left a comment

alexcrichton May 26, 2021

alexcrichton commented May 26, 2021

rfcbot commented May 26, 2021 •

edited by ehuss

Loading

Eh2406 commented May 27, 2021

rfcbot commented May 27, 2021

ehuss commented May 27, 2021

ehuss commented May 27, 2021

bors commented May 27, 2021

bors commented May 27, 2021

bors commented May 27, 2021

alexcrichton commented May 27, 2021

alexcrichton commented May 27, 2021

bors commented May 27, 2021

bors commented May 27, 2021

SergioBenitez commented Jun 4, 2021

Update to semver 1.0.0 #9508

Update to semver 1.0.0 #9508

Conversation

dtolnay commented May 26, 2021

rust-highfive commented May 26, 2021

dtolnay May 26, 2021

Choose a reason for hiding this comment

alexcrichton May 26, 2021

Choose a reason for hiding this comment

dtolnay May 26, 2021

Choose a reason for hiding this comment

dtolnay May 26, 2021 • edited Loading

Choose a reason for hiding this comment

Eh2406 commented May 26, 2021

alexcrichton left a comment

Choose a reason for hiding this comment

alexcrichton May 26, 2021

Choose a reason for hiding this comment

alexcrichton commented May 26, 2021

rfcbot commented May 26, 2021 • edited by ehuss Loading

Eh2406 commented May 27, 2021

rfcbot commented May 27, 2021

ehuss commented May 27, 2021

ehuss commented May 27, 2021

bors commented May 27, 2021

bors commented May 27, 2021

bors commented May 27, 2021

alexcrichton commented May 27, 2021

alexcrichton commented May 27, 2021

bors commented May 27, 2021

bors commented May 27, 2021

SergioBenitez commented Jun 4, 2021

dtolnay May 26, 2021 •

edited

Loading

rfcbot commented May 26, 2021 •

edited by ehuss

Loading