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.

Sign up for GitHub

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

Jump to bottom

rustc: Fix ICE with #[target_feature] on module #48752

Merged
merged 1 commit into from Mar 9, 2018
Merged

rustc: Fix ICE with #[target_feature] on module #48752

merged 1 commit into from Mar 9, 2018

Conversation

alexcrichton
Copy link
Member

This commit fixes an ICE in rustc when #[target_feature] was applied to items
other than functions due to the way the feature was validated.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

(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 Mar 5, 2018
@alexcrichton
Copy link
Member Author

r? @michaelwoerister

@michaelwoerister
Copy link
Member

Thanks, @alexcrichton!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 7, 2018

📌 Commit 48af57f has been approved by michaelwoerister

@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 Mar 7, 2018
@bors
Copy link
Contributor

bors commented Mar 8, 2018

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2018
@alexcrichton
rustc: Fix ICE with #[target_feature] on module
4bde92c 
This commit fixes an ICE in rustc when `#[target_feature]` was applied to items
other than functions due to the way the feature was validated.
@alexcrichton
Copy link
Member Author

@bors: r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 8, 2018

📌 Commit 4bde92c has been approved by michaelwoerister

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 8, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 8, 2018
@Manishearth
Rollup merge of rust-lang#48752 - alexcrichton:fix-target-feature, r=…
c8a73e4 
…michaelwoerister

rustc: Fix ICE with `#[target_feature]` on module

This commit fixes an ICE in rustc when `#[target_feature]` was applied to items
other than functions due to the way the feature was validated.
@Manishearth Manishearth mentioned this pull request Mar 8, 2018
Merged
bors added a commit that referenced this pull request Mar 8, 2018
@bors
Auto merge of #48849 - Manishearth:rollup, r=Manishearth
604d4ce 
Rollup of 7 pull requests

- Successful merges: #48292, #48682, #48699, #48738, #48752, #48789, #48808
- Failed merges:
@bors bors merged commit 4bde92c into rust-lang:master Mar 9, 2018
@alexcrichton alexcrichton deleted the fix-target-feature branch March 19, 2018 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelwoerister michaelwoerister

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@alexcrichton @rust-highfive @michaelwoerister @bors @pnkfelix