Skip to content

Rollup of 4 pull requests #60767

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
Merged
merged 11 commits into from
May 12, 2019
Merged

Rollup of 4 pull requests #60767

merged 11 commits into from
May 12, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 12, 2019

Successful merges:

Failed merges:

r? @ghost

Pulkit07 and others added 11 commits May 12, 2019 01:50
@Pulkit07
Fix HIR printing of existential type rust-lang#60662
3b78a47 
This fixes rust-lang#60662
@petrochenkov
syntax: Remove some legacy nonterminal tokens
14b3538
@Centril
ast_validation: comments -> doc comments
0535e42
@Centril
syntax::parse::parser: convert unnecessary '&mut self's to '&self'.
9b4a630
@Centril
parse_bottom_expr: extract common 'return' out.
b680b66
@Centril
Minor cleanup in parse_assoc_expr_with.
4aa4a8f
@shiatsumat
Fix minor typos for ItemLocalId
0fc2cfb 
* added comma before 'that is'
* "can be implement" -> "can be implemented"
@Centril
Rollup merge of rust-lang#60694 - Pulkit07:issue60662, r=alexreg
8327517 
Fix HIR printing of existential type rust-lang#60662

This fixes rust-lang#60662
@Centril
Rollup merge of rust-lang#60750 - petrochenkov:noquotok2, r=Mark-Simu…
d11b6be 
…lacrum

syntax: Remove some legacy nonterminal tokens

They were used by legacy quote macros removed in rust-lang#51285.
@Centril
Rollup merge of rust-lang#60751 - Centril:general-cleanup, r=petroche…
c0aeaa1 
…nkov

Assorted cleanup in parser & AST validation

r? @petrochenkov

Extracted out of a larger PR.
@Centril
Rollup merge of rust-lang#60752 - shiatsumat:minor-typos-hir, r=wesle…
b381e52 
…ywiser

Fix minor typos for ItemLocalId

* added comma after 'that is'
* "can be implement" -> "can be implemented"
@Centril
Copy link
Contributor Author

Centril commented May 12, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Collaborator

bors commented May 12, 2019

📌 Commit b381e52 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 12, 2019
@bors
Copy link
Collaborator

bors commented May 12, 2019

⌛ Testing commit b381e52 with merge 4443957...

bors added a commit that referenced this pull request May 12, 2019
@bors
Auto merge of #60767 - Centril:rollup-4cbsb73, r=Centril
4443957 
Rollup of 4 pull requests

Successful merges:

 - #60694 (Fix HIR printing of existential type #60662)
 - #60750 (syntax: Remove some legacy nonterminal tokens)
 - #60751 (Assorted cleanup in parser & AST validation)
 - #60752 (Fix minor typos for ItemLocalId)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented May 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 4443957 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 12, 2019
@bors bors merged commit b381e52 into rust-lang:master May 12, 2019
This was referenced May 12, 2019
Merged
Merged
@Centril Centril deleted the rollup-4cbsb73 branch May 12, 2019 23:40
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.
5 participants
@Centril @bors @Pulkit07 @petrochenkov @shiatsumat