Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc: Don't ICE on usage of two new target features #56908

Merged
merged 1 commit into from
Dec 19, 2018

Conversation

alexcrichton
Copy link
Member

I seem to always forget to update this portion of the compiler...

@rust-highfive
Copy link
Collaborator

r? @oli-obk

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2018
@bors
Copy link
Contributor

bors commented Dec 17, 2018

☔ The latest upstream changes (presumably #56642) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor

oli-obk commented Dec 17, 2018

r=me after a rebase

I seem to always forget to update this portion of the compiler...
@alexcrichton
Copy link
Member Author

@bors: r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 17, 2018

📌 Commit a0b766d has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2018
@jethrogb
Copy link
Contributor

Can we make a test that makes it harder to forget this part?

@alexcrichton
Copy link
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

@alexcrichton
Copy link
Member Author

@bors: rollup

pietroalbini added a commit to pietroalbini/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
@bors bors merged commit a0b766d into rust-lang:master Dec 19, 2018
@alexcrichton alexcrichton deleted the new-features branch March 12, 2019 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants