Warn when an edition 2021 crate is in a virtual workspace with default resolver #10910

Nemo157 · 2022-07-28T15:51:22Z

Edition 2021 updates the default resolver to version "2", but developers using virtual workspaces commonly don't get this update because the virtual workspace defaults to version "1". Warn when this situation occurs so those developers can explicitly configure their workspace and will be more likely to know that they will need to update it in the future.

Fixes #10112

rust-highfive · 2022-07-28T15:51:25Z

r? @ehuss

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

Nemo157 · 2022-07-28T15:56:28Z

This is mostly a problem for binary packages, but it does also affect library packages in some situations; e.g. it can cause issues when a different resolver is used while building the docs on docs.rs than when building in the projects CI: tokio-rs/axum#1180

src/cargo/core/workspace.rs

Nemo157 · 2022-07-29T15:53:30Z

I'll update this based on the discussion in #10112 tomorrow.

bors · 2022-08-10T15:21:40Z

☔ The latest upstream changes (presumably #10961) made this pull request unmergeable. Please resolve the merge conflicts.

src/cargo/core/workspace.rs

weihanglo · 2023-02-09T11:15:53Z

Ping @Nemo157. Just checking in to see if you have time and are still interested in working on this. If you have any question, feel free to discuss here or on Zulip.

…t resolver Edition 2021 updates the default resolver to version "2", but developers using virtual workspaces commonly don't get this update because the virtual workspace defaults to version "1". Warn when this situation occurs so those developers can explicitly configure their workspace and will be more likely to know that they will need to update it in the future.

Nemo157 · 2023-05-26T14:41:52Z

Sorry about the delay, I finally got around to rebasing and implemented both suggestions from above.

epage

Let me know what your thoughts are on another round for tweaking the messages

I look forward to #12115 since it will open the door for more cargo warnings and we'll be able to have a broader mismatch warning that people can disable.

tests/testsuite/features2.rs

epage · 2023-05-26T19:57:21Z

Thanks!

@bors r+

bors · 2023-05-26T19:57:24Z

📌 Commit 3dec6f2 has been approved by epage

It is now in the queue for this repository.

bors · 2023-05-26T19:57:30Z

⌛ Testing commit 3dec6f2 with merge d08c587...

bors · 2023-05-26T20:49:27Z

☀️ Test successful - checks-actions
Approved by: epage
Pushing d08c587 to master...

ehuss · 2023-05-27T17:54:29Z

Thanks @Nemo157 for picking this back up.

@weihanglo I recommend adding resolver = "1" to the rust-lang/rust workspace when you do the next update so that warnings don't start getting generated.

(I recall trying to add resolver = "2" in the past, and it not going well. That should probably be done as a separate PR if anyone wants to try that.)

rust-lang/cargo#10910 starts emitting warning if resolver is not set for 2021 edition package. We want to surpress the warning for now.

Update cargo 17 commits in 64fb38c97ac4d3a327fc9032c862dd28c8833b17..f7b95e31642e09c2b6eabb18ed75007dda6677a0 2023-05-23 18:53:23 +0000 to 2023-05-30 19:25:02 +0000 - chore: detect the channel a PR wants to merge into (rust-lang/cargo#12181) - refactor: de-depulicate `make_dep_prefix` implementation (rust-lang/cargo#12203) - Re-enable code_generation test on Windows (rust-lang/cargo#12199) - docs: add doc comments for git source and friends (rust-lang/cargo#12192) - test: set retry sleep to 1ms for all tests (rust-lang/cargo#12194) - fix(add): Reduce the chance we re-format the user's `[features]` table (rust-lang/cargo#12191) - test(add): Remove expensive test (rust-lang/cargo#12188) - Add a description of `Cargo.lock` conflicts in the Cargo FAQ (rust-lang/cargo#12185) - refactor(tests): Reduce cargo-add setup load (rust-lang/cargo#12189) - Warn when an edition 2021 crate is in a virtual workspace with default resolver (rust-lang/cargo#10910) - refactor(tests): Reduce cargo-remove setup load (rust-lang/cargo#12184) - chore: Lexicographically order `-Z` flags (rust-lang/cargo#12182) - chore(ci): remove temporary fix for rustup 1.24.1 (rust-lang/cargo#12180) - fix: AIX searches dynamic libraries in `LIBPATH`. (rust-lang/cargo#11968) - deps: remove unused features from windows-sys (rust-lang/cargo#12176) - Automatically inherit workspace lints when running cargo new/init (rust-lang/cargo#12174) - Test that the new `debuginfo` options match between cargo and rustc (rust-lang/cargo#12022) r? `@ghost`

See rust-lang/cargo#10910, released with Rust 1.70 ``` warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"` ```

rust-lang/cargo#10910 starts emitting warning if resolver is not set for 2021 edition package. We want to surpress the warning for now.

Update cargo 17 commits in 64fb38c97ac4d3a327fc9032c862dd28c8833b17..f7b95e31642e09c2b6eabb18ed75007dda6677a0 2023-05-23 18:53:23 +0000 to 2023-05-30 19:25:02 +0000 - chore: detect the channel a PR wants to merge into (rust-lang/cargo#12181) - refactor: de-depulicate `make_dep_prefix` implementation (rust-lang/cargo#12203) - Re-enable code_generation test on Windows (rust-lang/cargo#12199) - docs: add doc comments for git source and friends (rust-lang/cargo#12192) - test: set retry sleep to 1ms for all tests (rust-lang/cargo#12194) - fix(add): Reduce the chance we re-format the user's `[features]` table (rust-lang/cargo#12191) - test(add): Remove expensive test (rust-lang/cargo#12188) - Add a description of `Cargo.lock` conflicts in the Cargo FAQ (rust-lang/cargo#12185) - refactor(tests): Reduce cargo-add setup load (rust-lang/cargo#12189) - Warn when an edition 2021 crate is in a virtual workspace with default resolver (rust-lang/cargo#10910) - refactor(tests): Reduce cargo-remove setup load (rust-lang/cargo#12184) - chore: Lexicographically order `-Z` flags (rust-lang/cargo#12182) - chore(ci): remove temporary fix for rustup 1.24.1 (rust-lang/cargo#12180) - fix: AIX searches dynamic libraries in `LIBPATH`. (rust-lang/cargo#11968) - deps: remove unused features from windows-sys (rust-lang/cargo#12176) - Automatically inherit workspace lints when running cargo new/init (rust-lang/cargo#12174) - Test that the new `debuginfo` options match between cargo and rustc (rust-lang/cargo#12022) r? `@ghost`

…ust-lang/cargo#10910

rust-highfive assigned ehuss Jul 28, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2022

epage reviewed Jul 28, 2022

View reviewed changes

src/cargo/core/workspace.rs Outdated Show resolved Hide resolved

epage reviewed Jul 28, 2022

View reviewed changes

src/cargo/core/workspace.rs Outdated Show resolved Hide resolved

Nemo157 force-pushed the lint-different-resolver-10112 branch from 2ca333f to 79f3229 Compare July 28, 2022 16:39

Muscraft mentioned this pull request Jul 28, 2022

Infer resolver version from workspace edition #10587

Open

Nemo157 mentioned this pull request Jul 28, 2022

Add lint to explicitly set resolver in a virtual workspace #10112

Closed

Nemo157 force-pushed the lint-different-resolver-10112 branch from 79f3229 to 1ed5869 Compare August 10, 2022 17:46

Muscraft reviewed Aug 10, 2022

View reviewed changes

src/cargo/core/workspace.rs Outdated Show resolved Hide resolved

src/cargo/core/workspace.rs Outdated Show resolved Hide resolved

Nemo157 changed the title ~~Warn on any inconsistency in workspace and package resolver~~ Warn when an edition 2021 crate is in a virtual workspace with default resolver Aug 10, 2022

epage mentioned this pull request Sep 30, 2022

Add "resolver = 2" option to workspace manifest examples #10625

Closed

weihanglo added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2022

epage mentioned this pull request Dec 6, 2022

cargo feature confusion in workspaces #11459

Closed

weihanglo mentioned this pull request Mar 8, 2023

Moving repository to a virtual manifest can cause surprising dependency resolution errors due to resolver fallback #11811

Closed

weihanglo mentioned this pull request Apr 26, 2023

Features required for dependencies influenced by build-dependencies. rust-lang/rust#107845

Closed

Nemo157 added 3 commits May 26, 2023 16:11

Detect actual edition/resolver for warning message

8b8a3a8

Mention workspace root's manifest explicitly

620f66f

Nemo157 force-pushed the lint-different-resolver-10112 branch from 1ed5869 to 620f66f Compare May 26, 2023 14:41

rustbot added the A-workspaces Area: workspaces label May 26, 2023

Update cargo new workspace inheritance tests to specify resolver

c31877d

epage approved these changes May 26, 2023

View reviewed changes

tests/testsuite/features2.rs Outdated Show resolved Hide resolved

tests/testsuite/features2.rs Outdated Show resolved Hide resolved

Improve warning message grammar

7067d0d

Nemo157 force-pushed the lint-different-resolver-10112 branch from 9e86985 to 49cc60b Compare May 26, 2023 18:21

Remove unnecessary warning line

3dec6f2

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-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels May 26, 2023

bors merged commit d08c587 into rust-lang:master May 26, 2023
21 checks passed

Nemo157 deleted the lint-different-resolver-10112 branch May 26, 2023 21:03

Imberflur mentioned this pull request May 29, 2023

Improve actionability of "resolver = 2" error gfx-rs/wgpu#2217

Closed

weihanglo mentioned this pull request May 30, 2023

Update cargo rust-lang/rust#112120

Merged

weihanglo added a commit to weihanglo/rust that referenced this pull request May 30, 2023

Explicit set workspace.resolver = "1"

5abff37

rust-lang/cargo#10910 starts emitting warning if resolver is not set for 2021 edition package. We want to surpress the warning for now.

ehuss added this to the 1.72.0 milestone Jun 2, 2023

tomaka mentioned this pull request Jun 3, 2023

Set resolver = "2" in the workspace Cargo.toml smol-dot/smoldot#656

Merged

DaniPopes mentioned this pull request Jun 3, 2023

fix: cargo warning foundry-rs/foundry#5105

Merged

taiki-e mentioned this pull request Jun 4, 2023

Add unsafe-assume-single-core and related Cargo features. taiki-e/portable-atomic#94

Merged

epage mentioned this pull request Jun 6, 2023

User control over cargo warnings #12235

Open

5 tasks

calebzulawski pushed a commit to rust-lang/portable-simd that referenced this pull request Jun 7, 2023

Explicit set workspace.resolver = "1"

ed2ee7a

rust-lang/cargo#10910 starts emitting warning if resolver is not set for 2021 edition package. We want to surpress the warning for now.

weihanglo mentioned this pull request Jun 15, 2023

wasm crate works only as workspace non-member #12274

Closed

epage mentioned this pull request Jul 21, 2023

docs: raise awareness of resolver used inside workspace #12388

Merged

thomcc pushed a commit to tcdi/postgrestd that referenced this pull request Aug 24, 2023

Explicit set workspace.resolver = "1"

6f8cb2e

rust-lang/cargo#10910 starts emitting warning if resolver is not set for 2021 edition package. We want to surpress the warning for now.

tronical mentioned this pull request Sep 1, 2023

[RUST] Webasm compile issue with font_fallbacks_for_request method slint-ui/slint#2582

Closed

spmadden added a commit to spmadden/irox that referenced this pull request Sep 10, 2023

chore(build): Explicitly specify resolver in workspace definition - r…

905e0c8

…ust-lang/cargo#10910

weihanglo mentioned this pull request Sep 15, 2023

Regression: build-dependencies and dependencies should not have features unified #12676

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Warn when an edition 2021 crate is in a virtual workspace with default resolver #10910

Warn when an edition 2021 crate is in a virtual workspace with default resolver #10910

Nemo157 commented Jul 28, 2022 •

edited

Loading

rust-highfive commented Jul 28, 2022

Nemo157 commented Jul 28, 2022

Nemo157 commented Jul 29, 2022

bors commented Aug 10, 2022

weihanglo commented Feb 9, 2023

Nemo157 commented May 26, 2023

epage left a comment

epage commented May 26, 2023

bors commented May 26, 2023

bors commented May 26, 2023

bors commented May 26, 2023

ehuss commented May 27, 2023

Warn when an edition 2021 crate is in a virtual workspace with default resolver #10910

Warn when an edition 2021 crate is in a virtual workspace with default resolver #10910

Conversation

Nemo157 commented Jul 28, 2022 • edited Loading

rust-highfive commented Jul 28, 2022

Nemo157 commented Jul 28, 2022

Nemo157 commented Jul 29, 2022

bors commented Aug 10, 2022

weihanglo commented Feb 9, 2023

Nemo157 commented May 26, 2023

epage left a comment

Choose a reason for hiding this comment

epage commented May 26, 2023

bors commented May 26, 2023

bors commented May 26, 2023

bors commented May 26, 2023

ehuss commented May 27, 2023

Nemo157 commented Jul 28, 2022 •

edited

Loading