Adapt llvm-has-rust-patches validation to take llvm-config into account.#120890
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 11, 2024
Merged
Adapt llvm-has-rust-patches validation to take llvm-config into account.#120890bors merged 1 commit intorust-lang:masterfrom
llvm-has-rust-patches validation to take llvm-config into account.#120890bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use r? to explicitly pick a reviewer |
rustbot
added
S-waiting-on-review
Collaborator
|
This PR modifies If appropriate, please update |
onur-ozkan
reviewed
Feb 10, 2024
Contributor
|
r? onur-ozkan |
onur-ozkan
added
S-waiting-on-author
TimNN
force-pushed
the
relax-patches-check
branch
2 times, most recently
from
174a311 to
36bdb6b
Compare
TimNN
changed the title
llvm-has-rust-patches can be set.llvm-has-rust-patches validation to take llvm-config into account.
TimNN
force-pushed
the
relax-patches-check
branch
from
36bdb6b to
fd470e5
Compare
Contributor
Author
|
Sorry, I messed up the initial fixup commit. Should be resolved now. |
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 11, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119213 (simd intrinsics: add simd_shuffle_generic and other missing intrinsics) - rust-lang#120272 (Suppress suggestions in derive macro) - rust-lang#120773 (large_assignments: Allow moves into functions) - rust-lang#120874 (Take empty `where` bounds into account when suggesting predicates) - rust-lang#120882 (interpret/write_discriminant: when encoding niched variant, ensure the stored value matches) - rust-lang#120883 (interpret: rename ReadExternStatic → ExternStatic) - rust-lang#120890 (Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account.) - rust-lang#120895 (don't skip coercions for types with errors) - rust-lang#120896 (Print kind of coroutine closure) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 11, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119213 (simd intrinsics: add simd_shuffle_generic and other missing intrinsics) - rust-lang#120272 (Suppress suggestions in derive macro) - rust-lang#120773 (large_assignments: Allow moves into functions) - rust-lang#120874 (Take empty `where` bounds into account when suggesting predicates) - rust-lang#120882 (interpret/write_discriminant: when encoding niched variant, ensure the stored value matches) - rust-lang#120883 (interpret: rename ReadExternStatic → ExternStatic) - rust-lang#120890 (Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account.) - rust-lang#120895 (don't skip coercions for types with errors) - rust-lang#120896 (Print kind of coroutine closure) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 11, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119213 (simd intrinsics: add simd_shuffle_generic and other missing intrinsics) - rust-lang#120272 (Suppress suggestions in derive macro) - rust-lang#120773 (large_assignments: Allow moves into functions) - rust-lang#120874 (Take empty `where` bounds into account when suggesting predicates) - rust-lang#120882 (interpret/write_discriminant: when encoding niched variant, ensure the stored value matches) - rust-lang#120883 (interpret: rename ReadExternStatic → ExternStatic) - rust-lang#120890 (Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account.) - rust-lang#120895 (don't skip coercions for types with errors) - rust-lang#120896 (Print kind of coroutine closure) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 11, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119213 (simd intrinsics: add simd_shuffle_generic and other missing intrinsics) - rust-lang#120272 (Suppress suggestions in derive macro) - rust-lang#120773 (large_assignments: Allow moves into functions) - rust-lang#120874 (Take empty `where` bounds into account when suggesting predicates) - rust-lang#120882 (interpret/write_discriminant: when encoding niched variant, ensure the stored value matches) - rust-lang#120883 (interpret: rename ReadExternStatic → ExternStatic) - rust-lang#120890 (Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account.) - rust-lang#120895 (don't skip coercions for types with errors) - rust-lang#120896 (Print kind of coroutine closure) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 11, 2024
Rollup merge of rust-lang#120890 - TimNN:relax-patches-check, r=onur-ozkan Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account. This adapts an assertion that was added in rust-lang#119556. The current assertion does not take the `llvm-config` setting into accounts, which does not match the `llvm-has-rust-patches` documentation, which states: > This would be used in conjunction with either an llvm-config or build.submodules = false. (It also breaks my workflow: I build LLVM separately, but do have the rust patches applied). --- **edit:** Originally this PR just removed the assertion, but it now implements the alternative mentioned here: An alternative fix would be to take `llvm-config` into account in the assertion, but to me the assertion seems to provide little value, thus the simpler fix of just removing it. cc `@onur-ozkan,` in case I'm missing a reason to keep the assertion.
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.
This adapts an assertion that was added in #119556.
The current assertion does not take the
llvm-configsetting into accounts, which does not match thellvm-has-rust-patchesdocumentation, which states:(It also breaks my workflow: I build LLVM separately, but do have the rust patches applied).
edit: Originally this PR just removed the assertion, but it now implements the alternative mentioned here:
An alternative fix would be to take
llvm-configinto account in the assertion, but to me the assertion seems to provide little value, thus the simpler fix of just removing it.cc @onur-ozkan, in case I'm missing a reason to keep the assertion.