fix(config): Adjust MSRV resolve config field name / values#14296
fix(config): Adjust MSRV resolve config field name / values#14296bors merged 3 commits intorust-lang:masterfrom
Conversation
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
655ae80 to
feecbd7
Compare
src/doc/src/reference/unstable.md
Outdated
| Select which policy should be used when resolving dependencies. Values include | ||
| - `something-like-maximum`: prefer highest compatible versions of a package | ||
| - `something-like-rust-version`: prefer versions of packages compatible with your project's Rust version | ||
| Select how packages with incompatible rust-versions should be resolved. Values include: |
There was a problem hiding this comment.
It is unclear what an incompatible rust-version is. Should we link "incompatible rust-versions" to package.rust-version in the manifest?
There was a problem hiding this comment.
I've called out the field name. We should eventually turn all of those into links.
src/doc/src/reference/unstable.md
Outdated
| - `something-like-maximum`: prefer highest compatible versions of a package | ||
| - `something-like-rust-version`: prefer versions of packages compatible with your project's Rust version | ||
| Select how packages with incompatible rust-versions should be resolved. Values include: | ||
| - `allow`: treat them like any other dependency |
There was a problem hiding this comment.
This is also unclear as user doesn't know how other dependency is treated. Are we making it vague for rooms for future behavior changes?
There was a problem hiding this comment.
I can't think of a reason to be intentionally vague about allow, I'm just unsure of what more needs to be described.
There was a problem hiding this comment.
I think the problem is pronouns and “other”. What is included in “other”? Maybe something like
| - `allow`: treat them like any other dependency | |
| - `allow`: treat `package.rust-version` incompatible dependency as compatible | |
| - `fallback`: only consider `package.rust-version` incompatible dependency if no other compatible dependency version matched |
Pronouns are often confusing, and I prefer to use them less.
(Maybe it is just me 😬)
There was a problem hiding this comment.
To be fully correct, its an "incompatible dependency version" (not just dependency). This starts to become a mouthful. I gave it a try by skipping on package. and just saying "version".
(and fixed places where I said package or dependency instead of version)
|
Removing the draft status as I've given time for some community input with only a passing reference to not liking something but the person didn't engage to get more details. |
Where can I find this? |
From https://hachyderm.io/@djc/112842279033657989
|
weihanglo
left a comment
There was a problem hiding this comment.
This seems fine to merge now. We will do an FCP when stabilizing it.
|
@bors r+ |
|
☀️ Test successful - checks-actions |
Update cargo 15 commits in 257b72b8adfb1f2aa9916cefca67285c21666276..fa646583675d7c140482bd906145c71b7fb4fc2b 2024-07-30 15:08:27 +0000 to 2024-08-02 16:08:06 +0000 - refactor(toml): Rename 'resolved' to 'normalized' (rust-lang/cargo#14342) - faq: rephrase offline usage. (rust-lang/cargo#14336) - docs(unstable): Improve nightly link (rust-lang/cargo#14344) - Fix a typo in 1.81 changes (rust-lang/cargo#14343) - Change tests to support `rustc` wording changes (rust-lang/cargo#14341) - chore(deps): update rust crate windows-sys to 0.59 (rust-lang/cargo#14335) - chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14332) - chore(deps): update compatible (rust-lang/cargo#14331) - chore(deps): update rust crate rusqlite to 0.32.0 (rust-lang/cargo#14334) - fix: also build manpage for cargo.md (rust-lang/cargo#14339) - fix(config): Adjust MSRV resolve config field name / values (rust-lang/cargo#14296) - fix(toml): Resolve regression from toml_edit 0.22.18 (rust-lang/cargo#14329) - test(publish): More dev-dep stripping cases (rust-lang/cargo#14327) - Use gmake on AIX (rust-lang/cargo#14323) - fix(publish): Don't strip non-dev features (rust-lang/cargo#14325) r? ghost
What does this PR try to resolve?
Fixes #13540
How should we test and review this PR?
Additional information