Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Fix ICE on malformed plugin attributes #48990

Merged
merged 2 commits into from
Mar 16, 2018
Merged

Fix ICE on malformed plugin attributes #48990

merged 2 commits into from
Mar 16, 2018

Conversation

ExpHP
Copy link
Contributor

@ExpHP ExpHP commented Mar 13, 2018

See #48941 for some discussion.

This bug had several duplicate reports which were never closed as dupes:

Fixes #47612
Fixes #48387
Fixes #48941
Fixes #48982

ExpHP added 2 commits March 13, 2018 15:23
@ExpHP
Add test for issue 48941
decbb83 
A broken test to be fixed in the next commit.
@ExpHP
Fix ICE on malformed plugin attributes
dc96467
@rust-highfive
Copy link
Contributor

r? @michaelwoerister

(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 13, 2018
@ExpHP
Copy link
Contributor Author

ExpHP commented Mar 13, 2018

Note: The expect in the MultiDecorator branch is there because, try as I might, I could not come up a test case where ok() failed there. (if it ever fails in the future, it will be easier to debug now that it does not drop the DiagnosticBuilder)

It is only my assumption that rustc is bailing out at an earlier stage after it fails to parse the list of traits in #[derive(...)].

@ExpHP
Copy link
Contributor Author

ExpHP commented Mar 13, 2018

r? @estebank

@estebank
Copy link
Contributor

r=me rollup once travis catches up

@estebank
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 15, 2018

📌 Commit dc96467 has been approved by estebank

@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 15, 2018
@kennytm kennytm mentioned this pull request Mar 15, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 15, 2018
@kennytm
Rollup merge of rust-lang#48990 - ExpHP:dont-drop-the-bomb, r=estebank
64490ff 
Fix ICE on malformed plugin attributes

See rust-lang#48941 for some discussion.

This bug had several duplicate reports which were never closed as dupes:

Fixes rust-lang#47612
Fixes rust-lang#48387
Fixes rust-lang#48941
Fixes rust-lang#48982
bors added a commit that referenced this pull request Mar 16, 2018
@bors
Auto merge of #49051 - kennytm:rollup, r=kennytm
36b6687 
Rollup of 17 pull requests

- Successful merges: #48706, #48875, #48892, #48922, #48957, #48959, #48961, #48965, #49007, #49024, #49042, #49050, #48853, #48990, #49037, #49049, #48972
- Failed merges:
@bors bors merged commit dc96467 into rust-lang:master Mar 16, 2018
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@estebank estebank

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
5 participants
@ExpHP @rust-highfive @estebank @bors @michaelwoerister