Skip to content

Rollup of 5 pull requests #68771

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

Merged
merged 11 commits into from
Feb 2, 2020
Merged

Rollup of 5 pull requests #68771

merged 11 commits into from
Feb 2, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Feb 2, 2020

Successful merges:

Failed merges:

r? @ghost

astrolemonade and others added 11 commits February 1, 2020 19:05
I updated the example of the `expect` examples so they won't contain depressing sentences any more !
Update option.rs

I updated the example of the `expect` examples so they won't contain depressing sentences any more !
Issue error on `compile-fail` header in UI test

Fixes rust-lang#68732

r? @Centril
parser: syntactically allow `self` in all `fn` contexts

Part of rust-lang#68728.

`self` parameters are now *syntactically* allowed as the first parameter irrespective of item context (and in function pointers). Instead, semantic validation (`ast_validation`) is used.

r? @petrochenkov
@Centril
Copy link
Contributor Author

Centril commented Feb 2, 2020

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Feb 2, 2020

📌 Commit 011fb23 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 Feb 2, 2020
@bors
Copy link
Collaborator

bors commented Feb 2, 2020

⌛ Testing commit 011fb23 with merge 994e5e7...

bors added a commit that referenced this pull request Feb 2, 2020
Rollup of 5 pull requests

Successful merges:

 - #68733 (Update option.rs)
 - #68760 (Issue error on `compile-fail` header in UI test)
 - #68763 (Do not suggest duplicate bounds)
 - #68764 (parser: syntactically allow `self` in all `fn` contexts)
 - #68769 (parser: avoid re-wrapping NtItem)

Failed merges:

r? @ghost
@Centril Centril added the rollup A PR which is a rollup label Feb 2, 2020
@bors
Copy link
Collaborator

bors commented Feb 2, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 994e5e7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 2, 2020
@bors bors merged commit 011fb23 into rust-lang:master Feb 2, 2020
@Centril Centril deleted the rollup-zllcup9 branch February 2, 2020 16:49
# for free to join this conversation on GitHub. Already have an account? # to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants