about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonas Schievink <jonasschievink@gmail.com>2020-04-30 00:06:12 +0200
committerJonas Schievink <jonasschievink@gmail.com>2020-04-30 00:10:30 +0200
commitcafa7a780af8dda22fc87bec75961979cd0801b5 (patch)
tree4d36e4d2b994858b1c6a37d1195ca8a8d1e62ad3
parent3e41483932ac0b569205abd4e3662c377faf60cf (diff)
downloadrust-cafa7a780af8dda22fc87bec75961979cd0801b5.tar.gz
rust-cafa7a780af8dda22fc87bec75961979cd0801b5.zip
Use or-patterns more
-rw-r--r--crates/ra_hir/src/semantics.rs19
1 files changed, 9 insertions, 10 deletions
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 2f42f877ca5..75ab2373e00 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -49,21 +49,20 @@ impl PathResolution {
             PathResolution::Def(ModuleDef::BuiltinType(builtin)) => {
                 Some(TypeNs::BuiltinType(*builtin))
             }
-            PathResolution::Def(ModuleDef::Const(_)) => None,
-            PathResolution::Def(ModuleDef::EnumVariant(_)) => None,
-            PathResolution::Def(ModuleDef::Function(_)) => None,
-            PathResolution::Def(ModuleDef::Module(_)) => None,
-            PathResolution::Def(ModuleDef::Static(_)) => None,
-            PathResolution::Def(ModuleDef::Trait(_)) => None,
+            PathResolution::Def(ModuleDef::Const(_))
+            | PathResolution::Def(ModuleDef::EnumVariant(_))
+            | PathResolution::Def(ModuleDef::Function(_))
+            | PathResolution::Def(ModuleDef::Module(_))
+            | PathResolution::Def(ModuleDef::Static(_))
+            | PathResolution::Def(ModuleDef::Trait(_)) => None,
             PathResolution::Def(ModuleDef::TypeAlias(alias)) => {
                 Some(TypeNs::TypeAliasId((*alias).into()))
             }
-            PathResolution::Local(_) => None,
+            PathResolution::Local(_) | PathResolution::Macro(_) => None,
             PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())),
             PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())),
-            PathResolution::Macro(_) => None,
-            PathResolution::AssocItem(AssocItem::Const(_)) => None,
-            PathResolution::AssocItem(AssocItem::Function(_)) => None,
+            PathResolution::AssocItem(AssocItem::Const(_))
+            | PathResolution::AssocItem(AssocItem::Function(_)) => None,
             PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => {
                 Some(TypeNs::TypeAliasId((*alias).into()))
             }