Use or-patterns more

This commit is contained in:
Jonas Schievink 2020-04-30 00:06:12 +02:00
parent 3e41483932
commit cafa7a780a

View file

@ -49,21 +49,20 @@ impl PathResolution {
PathResolution::Def(ModuleDef::BuiltinType(builtin)) => { PathResolution::Def(ModuleDef::BuiltinType(builtin)) => {
Some(TypeNs::BuiltinType(*builtin)) Some(TypeNs::BuiltinType(*builtin))
} }
PathResolution::Def(ModuleDef::Const(_)) => None, PathResolution::Def(ModuleDef::Const(_))
PathResolution::Def(ModuleDef::EnumVariant(_)) => None, | PathResolution::Def(ModuleDef::EnumVariant(_))
PathResolution::Def(ModuleDef::Function(_)) => None, | PathResolution::Def(ModuleDef::Function(_))
PathResolution::Def(ModuleDef::Module(_)) => None, | PathResolution::Def(ModuleDef::Module(_))
PathResolution::Def(ModuleDef::Static(_)) => None, | PathResolution::Def(ModuleDef::Static(_))
PathResolution::Def(ModuleDef::Trait(_)) => None, | PathResolution::Def(ModuleDef::Trait(_)) => None,
PathResolution::Def(ModuleDef::TypeAlias(alias)) => { PathResolution::Def(ModuleDef::TypeAlias(alias)) => {
Some(TypeNs::TypeAliasId((*alias).into())) Some(TypeNs::TypeAliasId((*alias).into()))
} }
PathResolution::Local(_) => None, PathResolution::Local(_) | PathResolution::Macro(_) => None,
PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())), PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())),
PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())), PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())),
PathResolution::Macro(_) => None, PathResolution::AssocItem(AssocItem::Const(_))
PathResolution::AssocItem(AssocItem::Const(_)) => None, | PathResolution::AssocItem(AssocItem::Function(_)) => None,
PathResolution::AssocItem(AssocItem::Function(_)) => None,
PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => { PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => {
Some(TypeNs::TypeAliasId((*alias).into())) Some(TypeNs::TypeAliasId((*alias).into()))
} }