Skip to content

Commit 73ff610

Browse files
committed
Use From instead of Into in resolver method
1 parent d6f9e88 commit 73ff610

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

crates/ra_hir/src/code_model.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,18 @@ impl ModuleDef {
203203

204204
pub fn resolver<D: DefDatabase + HirDatabase>(&self, db: &D) -> Option<Resolver> {
205205
Some(match self {
206-
ModuleDef::Module(m) => Into::<ModuleId>::into(m.clone()).resolver(db),
207-
ModuleDef::Function(f) => Into::<FunctionId>::into(f.clone()).resolver(db),
208-
ModuleDef::Adt(adt) => Into::<AdtId>::into(adt.clone()).resolver(db),
206+
ModuleDef::Module(m) => ModuleId::from(m.clone()).resolver(db),
207+
ModuleDef::Function(f) => FunctionId::from(f.clone()).resolver(db),
208+
ModuleDef::Adt(adt) => AdtId::from(adt.clone()).resolver(db),
209209
ModuleDef::EnumVariant(ev) => {
210-
Into::<GenericDefId>::into(Into::<GenericDef>::into(ev.clone())).resolver(db)
210+
GenericDefId::from(GenericDef::from(ev.clone())).resolver(db)
211211
}
212212
ModuleDef::Const(c) => {
213-
Into::<GenericDefId>::into(Into::<GenericDef>::into(c.clone())).resolver(db)
213+
GenericDefId::from(GenericDef::from(c.clone())).resolver(db)
214214
}
215-
ModuleDef::Static(s) => Into::<StaticId>::into(s.clone()).resolver(db),
216-
ModuleDef::Trait(t) => Into::<TraitId>::into(t.clone()).resolver(db),
217-
ModuleDef::TypeAlias(t) => Into::<ModuleId>::into(t.module(db)).resolver(db),
215+
ModuleDef::Static(s) => StaticId::from(s.clone()).resolver(db),
216+
ModuleDef::Trait(t) => TraitId::from(t.clone()).resolver(db),
217+
ModuleDef::TypeAlias(t) => ModuleId::from(t.module(db)).resolver(db),
218218
// FIXME: This should be a resolver relative to `std/core`
219219
ModuleDef::BuiltinType(_t) => None?,
220220
})

0 commit comments

Comments
 (0)