language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use From instead of Into in resolver method

Browse source
This commit is contained in:
Zac Pullar-Strecker 2020-07-11 11:23:33 +12:00
parent d6f9e8806a
commit 73ff610e41
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_hir/src/code_model.rs
View file

@ -203,18 +203,18 @@ impl ModuleDef {
pub fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> { pub fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
Some(match self { Some(match self {
ModuleDef::Module(m) => Into::<ModuleId>::into(m.clone()).resolver(db), ModuleDef::Module(m) => ModuleId::from(m.clone()).resolver(db),
ModuleDef::Function(f) => Into::<FunctionId>::into(f.clone()).resolver(db), ModuleDef::Function(f) => FunctionId::from(f.clone()).resolver(db),
ModuleDef::Adt(adt) => Into::<AdtId>::into(adt.clone()).resolver(db), ModuleDef::Adt(adt) => AdtId::from(adt.clone()).resolver(db),
ModuleDef::EnumVariant(ev) => { ModuleDef::EnumVariant(ev) => {
Into::<GenericDefId>::into(Into::<GenericDef>::into(ev.clone())).resolver(db) GenericDefId::from(GenericDef::from(ev.clone())).resolver(db)
} }
ModuleDef::Const(c) => { ModuleDef::Const(c) => {
Into::<GenericDefId>::into(Into::<GenericDef>::into(c.clone())).resolver(db) GenericDefId::from(GenericDef::from(c.clone())).resolver(db)
} }
ModuleDef::Static(s) => Into::<StaticId>::into(s.clone()).resolver(db), ModuleDef::Static(s) => StaticId::from(s.clone()).resolver(db),
ModuleDef::Trait(t) => Into::<TraitId>::into(t.clone()).resolver(db), ModuleDef::Trait(t) => TraitId::from(t.clone()).resolver(db),
ModuleDef::TypeAlias(t) => Into::<ModuleId>::into(t.module(db)).resolver(db), ModuleDef::TypeAlias(t) => ModuleId::from(t.module(db)).resolver(db),
// FIXME: This should be a resolver relative to `std/core` // FIXME: This should be a resolver relative to `std/core`
ModuleDef::BuiltinType(_t) => None?, ModuleDef::BuiltinType(_t) => None?,
}) })