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

Rollup of 5 pull requests #68546

Merged
merged 10 commits into from
Jan 26, 2020
Merged

Rollup of 5 pull requests #68546

merged 10 commits into from
Jan 26, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

kingslef and others added 10 commits January 23, 2020 15:37
@kingslef
add a test for rust-lang#60976
ad1cdec 
The test fails on 1.36.0 but passes on master.
@tesuji
Use Self instead of self return type
2d7f8b3
@Aaron1011
Add some type-alias-impl-trait regression tests
1605276 
Fixes rust-lang#57611
Fixes rust-lang#57807
@JohnTitor
Update submodules to rust-lang
cdc6898
@GuillaumeGomez
clean up error codeS E0229 and E0261
7fb8f7d
@JohnTitor
Rollup merge of rust-lang#68485 - kingslef:fix/test-60976, r=nikomats…
88429fb 
…akis

add a test for rust-lang#60976

The test fails on 1.36.0 but passes on master.

Huge thanks for @hellow554 actually digging out the minimized version of the
repro.

Fixes rust-lang#60976.
@JohnTitor
Rollup merge of rust-lang#68498 - Aaron1011:tait-regression-tests, r=…
e7c557b 
…Centril

Add some type-alias-impl-trait regression tests

Fixes rust-lang#57611
Fixes rust-lang#57807
@JohnTitor
Rollup merge of rust-lang#68514 - lzutao:fmt-Self, r=Dylan-DPC
424e15a 
Use Self instead of self return type
@JohnTitor
Rollup merge of rust-lang#68534 - JohnTitor:update-remote-url, r=jona…
7beac65 
…s-schievink

Update submodules to rust-lang

They're on rust-lang now. Should be green as it's the same change as rust-lang#65963 but let's make sure CI is green also.
@JohnTitor
Rollup merge of rust-lang#68540 - GuillaumeGomez:err-codes-cleanup-e0…
5774dd0 
…229-e0261, r=Dylan-DPC

clean up error codes E0229 and E0261

r? @Dylan-DPC
@JohnTitor
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jan 25, 2020

📌 Commit 5774dd0 has been approved by JohnTitor

@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 Jan 25, 2020
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Jan 25, 2020
@bors
Copy link
Contributor

bors commented Jan 25, 2020

⌛ Testing commit 5774dd0 with merge 83beb0a...

bors added a commit that referenced this pull request Jan 25, 2020
@bors
Auto merge of #68546 - JohnTitor:rollup-znuot4b, r=JohnTitor
83beb0a 
Rollup of 5 pull requests

Successful merges:

 - #68485 (add a test for #60976)
 - #68498 (Add some type-alias-impl-trait regression tests)
 - #68514 (Use Self instead of self return type)
 - #68534 (Update submodules to rust-lang)
 - #68540 (clean up error codes E0229 and E0261)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 26, 2020

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing 83beb0a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2020
@bors bors merged commit 5774dd0 into rust-lang:master Jan 26, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #68546!

Tested on commit 83beb0a.
Direct link to PR: #68546

💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 26, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#68546!
b9a9afd 
Tested on commit rust-lang/rust@83beb0a.
Direct link to PR: <rust-lang/rust#68546>

💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).
@JohnTitor JohnTitor deleted the rollup-znuot4b branch January 26, 2020 03:34
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.
7 participants
@JohnTitor @bors @rust-highfive @kingslef @tesuji @Aaron1011 @GuillaumeGomez