diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-17 08:12:34 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-17 08:12:34 +0000 |
commit | f7fbea509f1e5f840e715c912ee38aa997d1bfbc (patch) | |
tree | 2b4932678fc83624c278ca93cdf0f1d3a28346c2 /crates/hir/src/semantics.rs | |
parent | 6fcb5d772f16af0d1f62dad55fbde75072fb9e89 (diff) | |
parent | ff5f90d8ae2da8e4856d5c78f55e5cd02b178325 (diff) |
Merge #8063
8063: couple clippy::complexity fixes r=matklad a=matthiaskrgr
avoid redundant `.into()` calls to convert T into identical T (`let x: String = String::from("hello").into();`)
use `if let Some(x)` instead of `.is_some()` + `.unwrap()`
don't clone Copy types
remove redundant wrapped ?s: `Some(Some(3)?)` can just be `Some(3)`
use `.map(|x| y)` instead of `and_then(|x| Some(y)` on `Option`s
Co-authored-by: Matthias Krüger <[email protected]>
Diffstat (limited to 'crates/hir/src/semantics.rs')
-rw-r--r-- | crates/hir/src/semantics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 03c9371b5..00b076175 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs | |||
@@ -835,7 +835,7 @@ impl<'a> SemanticsScope<'a> { | |||
835 | resolver::ScopeDef::AdtSelfType(it) => ScopeDef::AdtSelfType(it.into()), | 835 | resolver::ScopeDef::AdtSelfType(it) => ScopeDef::AdtSelfType(it.into()), |
836 | resolver::ScopeDef::GenericParam(id) => ScopeDef::GenericParam(id.into()), | 836 | resolver::ScopeDef::GenericParam(id) => ScopeDef::GenericParam(id.into()), |
837 | resolver::ScopeDef::Local(pat_id) => { | 837 | resolver::ScopeDef::Local(pat_id) => { |
838 | let parent = resolver.body_owner().unwrap().into(); | 838 | let parent = resolver.body_owner().unwrap(); |
839 | ScopeDef::Local(Local { parent, pat_id }) | 839 | ScopeDef::Local(Local { parent, pat_id }) |
840 | } | 840 | } |
841 | }; | 841 | }; |