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 some more clippy warnings #78424

Merged
merged 3 commits into from
Oct 30, 2020
Merged

Fix some more clippy warnings #78424

merged 3 commits into from
Oct 30, 2020

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Oct 27, 2020

Found while working on #77351. It turns out that x.py clippy --fix does work on that branch as long as you pass CARGOFLAGS=--lib.

@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 27, 2020
@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2020
@petrochenkov
Copy link
Contributor

Looks like autofix removed some comments, they need to be restored.

@jyn514
Copy link
Member Author

jyn514 commented Oct 27, 2020

Looks like autofix removed some comments, they need to be restored.

See rust-lang/rustfix#190 for discussion about fixing this in rustfix.

@bors

This comment has been minimized.

Sign in to view
@jyn514 jyn514 force-pushed the THE-PAPERCLIP-COMETH branch from 77e8ece to 5a19ae3 Compare October 28, 2020 17:33
davidtwco
davidtwco approved these changes Oct 29, 2020
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

LGTM

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2020

📌 Commit 5a19ae3a87955a97156c096980b5e5d5b3654408 has been approved by davidtwco

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2020
@JohnTitor JohnTitor mentioned this pull request Oct 30, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 30, 2020
@bors
Auto merge of rust-lang#78562 - JohnTitor:rollup-otg906u, r=JohnTitor
388ef34 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#77334 (Reorder benches const variable)
 - rust-lang#77888 (Simplify a nested bool match)
 - rust-lang#77921 (f64: Refactor collapsible_if)
 - rust-lang#78523 (Revert invalid `fn` return type parsing change)
 - rust-lang#78524 (Avoid BorrowMutError with RUSTC_LOG=debug)
 - rust-lang#78545 (Make anonymous binders start at 0)
 - rust-lang#78554 (Improve wording of `core::ptr::drop_in_place` docs)
 - rust-lang#78556 (Link to pass docs from NRVO module docs)

Failed merges:

 - rust-lang#78424 (Fix some more clippy warnings)

r? `@ghost`
@bors

This comment has been minimized.

Sign in to view
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 30, 2020
@bors

This comment has been minimized.

Sign in to view
@jyn514 jyn514 force-pushed the THE-PAPERCLIP-COMETH branch from 5a19ae3 to 5339bd1 Compare October 30, 2020 14:13
@jyn514
Copy link
Member Author

jyn514 commented Oct 30, 2020

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Oct 30, 2020

📌 Commit 5339bd1 has been approved by davidtwco

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 30, 2020
@bors
Copy link
Contributor

bors commented Oct 30, 2020

⌛ Testing commit 5339bd1 with merge ffe5288...

@bors
Copy link
Contributor

bors commented Oct 30, 2020

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing ffe5288 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 30, 2020
@bors bors merged commit ffe5288 into rust-lang:master Oct 30, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 30, 2020
This was referenced Oct 30, 2020
Merged
Merged
@jyn514 jyn514 deleted the THE-PAPERCLIP-COMETH branch October 30, 2020 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.
6 participants
@jyn514 @rust-highfive @petrochenkov @bors @davidtwco @rustbot