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

Fix ICE #4579 #4590

Merged
merged 3 commits into from
Oct 2, 2019
Merged

Fix ICE #4579 #4590

merged 3 commits into from
Oct 2, 2019

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Sep 27, 2019 •
edited
Loading

Fixes #4579
Fixes #4584

r? @phansch

changelog: Fix ICE caused by Clippys const-utils

@flip1995 flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Sep 27, 2019
@bors
Copy link
Contributor

bors commented Sep 27, 2019

☔ The latest upstream changes (presumably #4591) made this pull request unmergeable. Please resolve the merge conflicts.

@flip1995 flip1995 force-pushed the ice_4579 branch 2 times, most recently from 30eaee0 to d8a9d6e Compare September 30, 2019 07:15
@flip1995 flip1995 mentioned this pull request Oct 1, 2019
Closed
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 1, 2019

📌 Commit d8a9d6e has been approved by Manishearth

bors added a commit that referenced this pull request Oct 1, 2019
@bors
Auto merge of #4590 - flip1995:ice_4579, r=Manishearth
fe37743 
Fix ICE #4579

Fixes #4579
Fixes #4584

r? @phansch

changelog: Fix ICE caused by Clippys const-utils
@bors
Copy link
Contributor

bors commented Oct 1, 2019

⌛ Testing commit d8a9d6e with merge fe37743...

@bors
Copy link
Contributor

bors commented Oct 1, 2019

💔 Test failed - status-appveyor

@phansch
Copy link
Member

phansch commented Oct 2, 2019

@bors retryr

@phansch
Copy link
Member

phansch commented Oct 2, 2019

@bors retry (good morning 🌅 )

@bors
Copy link
Contributor

bors commented Oct 2, 2019

⌛ Testing commit d8a9d6e with merge 37b0119...

bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of #4590 - flip1995:ice_4579, r=Manishearth
37b0119 
Fix ICE #4579

Fixes #4579
Fixes #4584

r? @phansch

changelog: Fix ICE caused by Clippys const-utils
@bors
Copy link
Contributor

bors commented Oct 2, 2019

💔 Test failed - checks-travis

@phansch
Copy link
Member

phansch commented Oct 2, 2019

needs a rebase, then it should be good to go

@phansch phansch added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Oct 2, 2019
@mati865
Copy link
Contributor

mati865 commented Oct 2, 2019

Integration tests won't pass because of Rust bug.

@Manishearth
Copy link
Member

Manishearth commented Oct 2, 2019 via email

@flip1995
Copy link
Member Author

flip1995 commented Oct 2, 2019

Rebased seemed to be enough

@bors r=Manishearth

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit 93bda48 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Oct 2, 2019

⌛ Testing commit 93bda48 with merge acacc33...

bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of #4590 - flip1995:ice_4579, r=Manishearth
acacc33 
Fix ICE #4579

Fixes #4579
Fixes #4584

r? @phansch

changelog: Fix ICE caused by Clippys const-utils
@bors
Copy link
Contributor

bors commented Oct 2, 2019

💔 Test failed - checks-travis

@flip1995
Copy link
Member Author

flip1995 commented Oct 2, 2019

Integration tests won't pass because of Rust bug.

Ups should have read the comments more carefully 😄

@bors r=Manishearth

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit eb1fc7b has been approved by Manishearth

bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of #4590 - flip1995:ice_4579, r=Manishearth
83f90aa 
Fix ICE #4579

Fixes #4579
Fixes #4584

r? @phansch

changelog: Fix ICE caused by Clippys const-utils
@bors
Copy link
Contributor

bors commented Oct 2, 2019

⌛ Testing commit eb1fc7b with merge 83f90aa...

@bors
Copy link
Contributor

bors commented Oct 2, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing 83f90aa to master...

@bors bors merged commit eb1fc7b into rust-lang:master Oct 2, 2019
@XVilka XVilka mentioned this pull request Oct 3, 2019
Merged
@flip1995 flip1995 mentioned this pull request Oct 5, 2019
Closed
@mati865 mati865 mentioned this pull request Oct 8, 2019
Closed
@tspiteri tspiteri mentioned this pull request Oct 11, 2019
Closed
@flip1995 flip1995 deleted the ice_4579 branch October 11, 2019 10:06
flip1995 added a commit to flip1995/rust that referenced this pull request Oct 11, 2019
@flip1995
Backport rust-lang/rust-clippy#4590 to rustc beta
8aacf98
@flip1995 flip1995 mentioned this pull request Oct 11, 2019
Merged
bors added a commit to rust-lang/rust that referenced this pull request Oct 15, 2019
@bors
Auto merge of #65305 - flip1995:clippy-beta-backport, r=pietroalbini
224f0bc 
[Beta] Backport Clippy ICE fix to beta

There was an ICE in Clippy, when compiling `mysql_common`. Since this is a pretty popular crate, and there were a bunch of Clippy issues in the last few days, I think it is worth it to backport the fix (rust-lang/rust-clippy#4590) to beta.

cc rust-lang/rust-clippy#4653

r? @Manishearth
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
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

unexpectedly panick when compiling mysql_common ICE with clippy on nightly
5 participants
@flip1995 @bors @Manishearth @phansch @mati865