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

rustup https://github.com/rust-lang/rust/pull/71215/ #5520

Merged
merged 4 commits into from
Apr 25, 2020
Merged

rustup https://github.com/rust-lang/rust/pull/71215/ #5520

merged 4 commits into from
Apr 25, 2020

Conversation

matthiaskrgr
Copy link
Member

There's currently an crash in ui/new_without_default.rs that I need to figure out how to avoid.

changelog: none

flip1995
flip1995 reviewed Apr 24, 2020
View reviewed changes
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this will fix the crash:

clippy_lints/src/derive.rs Outdated Show resolved Hide resolved
clippy_lints/src/new_without_default.rs Outdated Show resolved Hide resolved
@flip1995 flip1995 changed the title [WIP] rustup https://github.com/rust-lang/rust/pull/71215/ rustup https://github.com/rust-lang/rust/pull/71215/ Apr 24, 2020
@flip1995
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 24, 2020

📌 Commit f9c1acb has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Apr 24, 2020

⌛ Testing commit f9c1acb with merge d48507a...

bors added a commit that referenced this pull request Apr 24, 2020
@bors
Auto merge of #5520 - matthiaskrgr:rustup_44, r=flip1995
d48507a 
rustup rust-lang/rust#71215

There's currently an crash in `ui/new_without_default.rs` that I need to figure out how to avoid.

changelog: none
@bors
Copy link
Collaborator

bors commented Apr 24, 2020

💔 Test failed - checks-action_test

@flip1995
Copy link
Member

Let's wait if rust-lang/rust#71517 gets approved. Otherwise, we can just disable the unused_braces lint for now.

@flip1995 flip1995 added the S-waiting-on-bors Status: The marked PR was approved and is only waiting bors label Apr 24, 2020
@flip1995
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

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

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

📌 Commit f9c1acb has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

⌛ Testing commit f9c1acb with merge 928ca72...

bors added a commit that referenced this pull request Apr 25, 2020
@bors
Auto merge of #5520 - matthiaskrgr:rustup_44, r=flip1995
928ca72 
rustup rust-lang/rust#71215

There's currently an crash in `ui/new_without_default.rs` that I need to figure out how to avoid.

changelog: none
@bors
Copy link
Collaborator

bors commented Apr 25, 2020

💔 Test failed - checks-action_test

@phansch
Copy link
Member

phansch commented Apr 25, 2020

looks like this just needs a UI test update due to rust-lang/rust#71494 getting merged as well

@flip1995
Copy link
Member

I'm working on it 👍

@flip1995
Copy link
Member

@phansch ready for review for the suggestion changes of the while_let_on_iterator lint.

@phansch
Copy link
Member

phansch commented Apr 25, 2020

@bors r=flip1995,phansch

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

📌 Commit dda1c8d has been approved by flip1995,phansch

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

⌛ Testing commit dda1c8d with merge 6ffe725...

flip1995
flip1995 reviewed Apr 25, 2020
View reviewed changes
tests/ui/while_let_on_iterator.fixed
values.insert(1);

for _ in values.iter() {
// FIXME(flip1995): Linting this with the following line uncommented is a FP, see #1654
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is not 100% correct, but by fixing #1654 the issue with the mutable borrow inside the loop is also fixed, since this is only possible, if the iterator is recreated on every iteration.

I'm working on a fix of #1654, but that is not for this PR.

@bors
Copy link
Collaborator

bors commented Apr 25, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995,phansch
Pushing 6ffe725 to master...

@bors bors merged commit 6ffe725 into rust-lang:master Apr 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flip1995 flip1995 flip1995 left review comments

Assignees
No one assigned
Labels
S-waiting-on-bors Status: The marked PR was approved and is only waiting bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matthiaskrgr @flip1995 @bors @phansch