rustc: Don't ICE on usage of two new target features#56908
Merged
bors merged 1 commit intorust-lang:masterfrom Dec 19, 2018
Merged
rustc: Don't ICE on usage of two new target features#56908bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
r? @oli-obk (rust_highfive has picked a reviewer for you, use r? to override) |
Collaborator
|
☔ The latest upstream changes (presumably #56642) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
r=me after a rebase |
I seem to always forget to update this portion of the compiler...
e1d4df8 to
a0b766d
Compare
Member
Author
|
@bors: r=oli-obk |
Collaborator
|
📌 Commit a0b766d has been approved by |
Contributor
|
Can we make a test that makes it harder to forget this part? |
Member
Author
|
Heh I'm sure we can! I'm not sure we add new features here often enough to make it worth it though. I'd certainly be willing to r+ such a patch though |
Member
Author
|
@bors: rollup |
emilyalbini
added a commit
to emilyalbini/rust
that referenced
this pull request
Dec 19, 2018
rustc: Don't ICE on usage of two new target features I seem to always forget to update this portion of the compiler...
bors
added a commit
that referenced
this pull request
Dec 19, 2018
Rollup of 15 pull requests Successful merges: - #56363 (Defactored Bytes::read) - #56663 (Remove lifetime from Resolver) - #56689 (add a lint group for lints emitted by rustdoc) - #56772 (fix issue 54153 by not testing issue-18804 on Windows nor OS X.) - #56820 (format-related tweaks) - #56881 (Implement Eq, PartialEq and Hash for atomic::Ordering) - #56907 (Fix grammar in compiler error for array iterators) - #56908 (rustc: Don't ICE on usage of two new target features) - #56910 (Do not point at delim spans for complete correct blocks) - #56913 (Enable stack probes for UEFI images) - #56918 (Profiler: simplify total_duration, improve readability) - #56931 (Update release notes for Rust 1.31.1) - #56947 (Add targets thumbv7neon-linux-androideabi and thumbv7neon-unknown-linux-gnueabihf) - #56948 (Update LLVM submodule) - #56959 (Fix mobile menu rendering collision with tooltip.) Failed merges: - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) 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
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.
I seem to always forget to update this portion of the compiler...