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

When encountering invalid token after unsafe, mention { #48356

Merged
merged 1 commit into from
Feb 24, 2018
Merged

When encountering invalid token after unsafe, mention { #48356

merged 1 commit into from
Feb 24, 2018

Conversation

estebank
Copy link
Contributor

Fix #37158.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Feb 19, 2018
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Feb 19, 2018 •
edited
Loading

ui test looks broken https://travis-ci.org/rust-lang/rust/builds/343489786#L2291

@estebank
Copy link
Contributor Author

Fixed

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Feb 20, 2018

📌 Commit 1aad320 has been approved by nikomatsakis

@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 Feb 20, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 24, 2018
@Manishearth
Rollup merge of rust-lang#48356 - estebank:unsafe-without-braces, r=n…
f80d057 
…ikomatsakis

When encountering invalid token after `unsafe`, mention `{`

Fix rust-lang#37158.
@Manishearth Manishearth mentioned this pull request Feb 24, 2018
Merged
bors added a commit that referenced this pull request Feb 24, 2018
@bors
Auto merge of #48510 - Manishearth:rollup, r=Manishearth
5cf8839 
Rollup of 15 pull requests

- Successful merges: #47987, #48056, #48061, #48084, #48143, #48185, #48206, #48208, #48232, #48246, #48258, #48317, #48353, #48356, #48402
- Failed merges:
Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 24, 2018
@Manishearth
Rollup merge of rust-lang#48356 - estebank:unsafe-without-braces, r=n…
fc7caed 
…ikomatsakis

When encountering invalid token after `unsafe`, mention `{`

Fix rust-lang#37158.
bors added a commit that referenced this pull request Feb 24, 2018
@bors
Auto merge of #48510 - Manishearth:rollup, r=Manishearth
28a1e4f 
Rollup of 15 pull requests

- Successful merges: #47987, #48056, #48061, #48084, #48143, #48185, #48206, #48208, #48232, #48246, #48258, #48317, #48353, #48356, #48402
- Failed merges:
@bors bors merged commit 1aad320 into rust-lang:master Feb 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

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.
4 participants
@estebank @rust-highfive @nikomatsakis @bors