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

couple more clippy fixes (let_and_return, if_same_then_else) #70254

Merged
merged 2 commits into from
Mar 22, 2020
Merged

couple more clippy fixes (let_and_return, if_same_then_else) #70254

merged 2 commits into from
Mar 22, 2020

Conversation

matthiaskrgr
Copy link
Member

  • summarize if-else-code with identical blocks (clippy::if_same_then_else)
  • don't create variable bindings just to return the bound value immediately (clippy::let_and_return)

@Centril
Copy link
Contributor

Centril commented Mar 21, 2020

r? @Centril @bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 21, 2020

📌 Commit 74d68ea has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned cramertj Mar 21, 2020
@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 Mar 21, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 22, 2020
@Centril
Rollup merge of rust-lang#70254 - matthiaskrgr:cl4ppy, r=Centril
688d655 
couple more clippy fixes (let_and_return, if_same_then_else)

* summarize if-else-code with identical blocks (clippy::if_same_then_else)
* don't create variable bindings just to return the bound value immediately (clippy::let_and_return)
@Centril Centril mentioned this pull request Mar 22, 2020
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 22, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2020
@bors
Auto merge of rust-lang#70275 - Dylan-DPC:rollup-1fbosob, r=Dylan-DPC
1902d1e 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#68099 (Amend Rc/Arc::from_raw() docs regarding unsafety)
 - rust-lang#70172 (parse/lexer: support `StringReader::retokenize` called on external files.)
 - rust-lang#70209 (parser: recover on `for<'a> |...| body` closures)
 - rust-lang#70223 (fix type of const params in associated types.)
 - rust-lang#70229 (more clippy fixes)
 - rust-lang#70240 (Return NonZeroU64 from ThreadId::as_u64.)
 - rust-lang#70250 (Remove wrong entry from RELEASES.md)
 - rust-lang#70253 (Remove another wrong entry from RELEASES.md)
 - rust-lang#70254 (couple more clippy fixes (let_and_return, if_same_then_else))
 - rust-lang#70266 (proc_macro_harness: Use item header spans for errors)

Failed merges:

r? @ghost
@bors bors merged commit 8fe8bad into rust-lang:master Mar 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Centril Centril

Labels
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.
4 participants
@matthiaskrgr @Centril @bors @cramertj