Fix test simd/extract-insert-dyn on s390x #140456
Open
+15
−1
Conversation
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
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
wesleywiser
reviewed
Apr 29, 2025
|
r? wesleywiser |
fneddy
force-pushed
the
fix_s390x_codegen_simd_ext_ins_dyn
branch
from
d00b33a to
24af1d9
Compare
wesleywiser
approved these changes
Apr 29, 2025
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 30, 2025
Rollup of 12 pull requests Successful merges: - rust-lang#136160 (Remove backticks from `ShouldPanic::YesWithMessage`'s `TrFailedMsg`) - rust-lang#138087 (Initial implementation of `core_float_math`) - rust-lang#139059 (uses_power_alignment: wording tweaks) - rust-lang#139192 (mention provenance in the pointer::wrapping_offset docs) - rust-lang#140312 (Improve pretty-printing of braces) - rust-lang#140404 (rm `TypeVistable` impls for `Canonical`) - rust-lang#140437 (enable msa feature for mips in codegen tests) - rust-lang#140438 (Add `rust.debug-assertions-tools` option) - rust-lang#140439 (miri: algebraic intrinsics: bring back float non-determinism) - rust-lang#140445 (Treat ManuallyDrop as ~const Destruct) - rust-lang#140446 (chore: fix some tests) - rust-lang#140448 (Rename `rustc_query_append!` to `rustc_with_all_queries!`) Failed merges: - rust-lang#140456 (Fix test simd/extract-insert-dyn on s390x) r? `@ghost` `@rustbot` modify labels: rollup
|
☔ The latest upstream changes (presumably #140503) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
|
Hi @fneddy, looks like rustfmt wants that attribute split across multiple lines now that it's gotten long. Could you also rebase? We don't allow merge commits in PRs to make the overall repo history simpler. (If you need help, this guide should have what you need in it https://rustc-dev-guide.rust-lang.org/git.html#i-made-a-merge-commit-by-accident) |
fneddy
force-pushed
the
fix_s390x_codegen_simd_ext_ins_dyn
branch
from
1226051 to
3b9ae29
Compare
This comment has been minimized.
This comment has been minimized.
fneddy
force-pushed
the
fix_s390x_codegen_simd_ext_ins_dyn
branch
from
3b9ae29 to
44d8257
Compare
rustbot
removed
has-merge-commits
|
thank you :) |
This comment has been minimized.
This comment has been minimized.
fneddy
force-pushed
the
fix_s390x_codegen_simd_ext_ins_dyn
branch
from
44d8257 to
c48b0e8
Compare
This comment has been minimized.
This comment has been minimized.
fneddy
force-pushed
the
fix_s390x_codegen_simd_ext_ins_dyn
branch
from
c48b0e8 to
f3f3248
Compare
This comment has been minimized.
This comment has been minimized.
Fix the test for s390x by enabling s390x vector extension via `target_feature(enable = "vector")`(rust-lang#127506). As this is is still gated by `#![feature(s390x_target_feature)]` we need that attribute also.
fneddy
force-pushed
the
fix_s390x_codegen_simd_ext_ins_dyn
branch
from
f3f3248 to
61488e5
Compare
|
everybody is mad at borrow checker while I am fighting with formatting 😭 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix the test for s390x by enabling s390x vector extension via
target_feature(enable = "vector")(#127506). As this is is still gated by#![feature(s390x_target_feature)]we need that attribute also.