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.

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

Merge backport branches into master #4109

Merged
merged 19 commits into from
May 19, 2019
Merged

Conversation

Manishearth
Copy link
Member

Attempt 2 at #4103

This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds

oli-obk and others added 19 commits August 9, 2018 09:43
…ntation

Enable rustup clippy to refer to the correct documentation
[Martins Polakovs, John Firebaugh]
As reported in rust-lang#3841. Only fixes the part where it triggers on the
`derive`.
rust-lang#4101

Splits up redundant_closure's method checking into a pedantic lint
Backport rust-lang#4101 to beta

This lint has been causing lots of problems.

I'll check up on other potential beta backports when I build the new changelog

r? @oli-obk
@Manishearth
Copy link
Member Author

Hopefully travis passes now.

@phansch
Copy link
Member

phansch commented May 17, 2019

It looks like this is also hitting #4108 :/ (I won't have time to investigate until Monday)

@Manishearth
Copy link
Member Author

Ah. No rush.

@oli-obk
Copy link
Contributor

oli-obk commented May 17, 2019

I am seeing this failure locally, too. I'll have a look

@phansch
Copy link
Member

phansch commented May 19, 2019

@bors r+ (failure is tracked in #4108)

@bors
Copy link
Collaborator

bors commented May 19, 2019

📌 Commit 9ba60b8 has been approved by phansch

@bors
Copy link
Collaborator

bors commented May 19, 2019

⌛ Testing commit 9ba60b8 with merge 0d2bb2e...

bors added a commit that referenced this pull request May 19, 2019
Merge backport branches into master

Attempt 2 at #4103

This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds
@bors
Copy link
Collaborator

bors commented May 19, 2019

💡 This pull request was already approved, no need to approve it again.

  • This pull request is currently being tested. If there's no response from the continuous integration service, you may use retry to trigger a build again.

@bors
Copy link
Collaborator

bors commented May 19, 2019

📌 Commit 9ba60b8 has been approved by phansch

@bors
Copy link
Collaborator

bors commented May 19, 2019

⌛ Testing commit 9ba60b8 with merge 0331b95...

bors added a commit that referenced this pull request May 19, 2019
Merge backport branches into master

Attempt 2 at #4103

This does nothing to the code, however it keeps the backport branches in master history, so that deleting a branch won't accidentally break old rustc builds
@bors
Copy link
Collaborator

bors commented May 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing 0331b95 to master...

@bors bors merged commit 9ba60b8 into rust-lang:master May 19, 2019
@flip1995 flip1995 mentioned this pull request Oct 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants