@@ -203,18 +203,18 @@ impl ModuleDef {
203
203
204
204
pub fn resolver < D : DefDatabase + HirDatabase > ( & self , db : & D ) -> Option < Resolver > {
205
205
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) ,
209
209
ModuleDef :: EnumVariant ( ev) => {
210
- Into :: < GenericDefId > :: into ( Into :: < GenericDef > :: into ( ev. clone ( ) ) ) . resolver ( db)
210
+ GenericDefId :: from ( GenericDef :: from ( ev. clone ( ) ) ) . resolver ( db)
211
211
}
212
212
ModuleDef :: Const ( c) => {
213
- Into :: < GenericDefId > :: into ( Into :: < GenericDef > :: into ( c. clone ( ) ) ) . resolver ( db)
213
+ GenericDefId :: from ( GenericDef :: from ( c. clone ( ) ) ) . resolver ( db)
214
214
}
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) ,
218
218
// FIXME: This should be a resolver relative to `std/core`
219
219
ModuleDef :: BuiltinType ( _t) => None ?,
220
220
} )
0 commit comments