feat(reslve): Respect '--ignore-rust-version'#13738
Merged
bors merged 3 commits intorust-lang:masterfrom Apr 11, 2024
Merged
Conversation
Collaborator
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
27 tasks
Member
|
@bors r+ |
Contributor
Contributor
bors
added a commit
that referenced
this pull request
Apr 11, 2024
feat(reslve): Respect '--ignore-rust-version' ### What does this PR try to resolve? This is a part of #9930. ### How should we test and review this PR? I had considered several ways of implementing this. I first looked at passing this into `ops::resolve*`. .This would get a bit annoying with the function signature, so I considered moving it to a builder.. Each of the entry points is slightly different with different ownership needs, making it hard to have a common abstraction. In doing this, I noticed we currently pass some state around to the resolver via `Workspace`, so I mirrored that. The nice thing about this location is it provides a good place to hook in config and `package.resolve` so they affect this. ### Additional information
Contributor
|
💔 Test failed - checks-actions |
Member
|
I think the failure is similar to the one I described in #13740 |
Member
|
@bors retry |
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Apr 12, 2024
fix(help): Generalize --ignore-rust-version ### What does this PR try to resolve? This is part of #9930 and updates for the help to accommodate #13738 and adding `--ignore-rust-version` to `cargo update` for when they are stable This includes - Moving `--ignore-rust-version` to be under the "Manifest options" header - Generalizing the help description ### How should we test and review this PR? ### Additional information
epage
added a commit
to epage/cargo
that referenced
this pull request
Apr 12, 2024
Seeing recent fialures on Windows - rust-lang#13748 - rust-lang#13738 - rust-lang#13740 and maybe more The test was added in rust-lang#12744. It seems of limited utility because there are innumerable ways of adding new writes that aren't atomic and we can't test for them all. Even this case, its limited. See also https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Flaky.20test.3A.20.20-death.3A.3Akill_cargo_add_never_corrupts_cargo/near/432979594
bors
added a commit
that referenced
this pull request
Apr 12, 2024
test: Remove add/remove death tests Seeing recent fialures on Windows - #13748 - #13738 - #13740 and maybe more The test was added in #12744. It seems of limited utility because there are innumerable ways of adding new writes that aren't atomic and we can't test for them all. Even this case, its limited. See also https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Flaky.20test.3A.20.20-death.3A.3Akill_cargo_add_never_corrupts_cargo/near/432979594
epage
added a commit
to epage/cargo
that referenced
this pull request
Apr 12, 2024
Seeing recent fialures on Windows - rust-lang#13748 - rust-lang#13738 - rust-lang#13740 and maybe more The test was added in rust-lang#12744. It seems of limited utility because there are innumerable ways of adding new writes that aren't atomic and we can't test for them all. Even this case, its limited. See also https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Flaky.20test.3A.20.20-death.3A.3Akill_cargo_add_never_corrupts_cargo/near/432979594
bors
added a commit
that referenced
this pull request
Apr 12, 2024
test: Remove add/remove death tests Seeing recent fialures on Windows - #13748 - #13738 - #13740 and maybe more The test was added in #12744. It seems of limited utility because there are innumerable ways of adding new writes that aren't atomic and we can't test for them all. Even this case, its limited. See also https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Flaky.20test.3A.20.20-death.3A.3Akill_cargo_add_never_corrupts_cargo/near/432979594
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 13, 2024
Update cargo 8 commits in 74fd5bc730b828dbc956335b229ac34ba47f7ef7..48eca1b164695022295ce466b64b44e4e0228b08 2024-04-10 18:40:49 +0000 to 2024-04-12 21:16:36 +0000 - test: Remove add/remove death tests (rust-lang/cargo#13750) - feat(resolve): Fallback to 'rustc -V' for MSRV resolving (rust-lang/cargo#13743) - feat(cli): Add --ignore-rust-version to update/generate-lockfile (rust-lang/cargo#13742) - `cargo package -p no-exist` emitt error when the -p `package` not found (rust-lang/cargo#13735) - fix(help): Generalize --ignore-rust-version (rust-lang/cargo#13741) - test: don't compress test registry crates (rust-lang/cargo#13744) - feat(reslve): Respect '--ignore-rust-version' (rust-lang/cargo#13738) - refactor: Remove `rust_2024_compatibility` lint group (rust-lang/cargo#13740) r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 13, 2024
Update cargo 8 commits in 74fd5bc730b828dbc956335b229ac34ba47f7ef7..48eca1b164695022295ce466b64b44e4e0228b08 2024-04-10 18:40:49 +0000 to 2024-04-12 21:16:36 +0000 - test: Remove add/remove death tests (rust-lang/cargo#13750) - feat(resolve): Fallback to 'rustc -V' for MSRV resolving (rust-lang/cargo#13743) - feat(cli): Add --ignore-rust-version to update/generate-lockfile (rust-lang/cargo#13742) - `cargo package -p no-exist` emitt error when the -p `package` not found (rust-lang/cargo#13735) - fix(help): Generalize --ignore-rust-version (rust-lang/cargo#13741) - test: don't compress test registry crates (rust-lang/cargo#13744) - feat(reslve): Respect '--ignore-rust-version' (rust-lang/cargo#13738) - refactor: Remove `rust_2024_compatibility` lint group (rust-lang/cargo#13740) r? ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
This is a part of #9930.
How should we test and review this PR?
I had considered several ways of implementing this. I first looked at passing this into
ops::resolve*..This would get a bit annoying with the function signature, so I considered moving it to a builder..
Each of the entry points is slightly different with different ownership needs, making it hard to have a common abstraction.
In doing this, I noticed we currently pass some state around to the resolver via
Workspace, so I mirrored that.The nice thing about this location is it provides a good place to hook in config and
package.resolveso they affect this.Additional information