@@ -293,7 +293,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
293
293
) -> Result < ( Res , Option < String > ) , ErrorKind < ' path > > {
294
294
let tcx = self . cx . tcx ;
295
295
let no_res = || ResolutionFailure :: NotResolved {
296
- module_id : module_id. into ( ) ,
296
+ module_id : module_id,
297
297
partial_res : None ,
298
298
unresolved : path_str. into ( ) ,
299
299
} ;
@@ -521,7 +521,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
521
521
// but the disambiguator logic expects the associated item.
522
522
// Store the kind in a side channel so that only the disambiguator logic looks at it.
523
523
if let Some ( ( kind, id) ) = side_channel {
524
- self . kind_side_channel . set ( Some ( ( kind, id. into ( ) ) ) ) ;
524
+ self . kind_side_channel . set ( Some ( ( kind, id) ) ) ;
525
525
}
526
526
Ok ( ( res, Some ( fragment) ) )
527
527
} ;
@@ -1268,7 +1268,7 @@ impl LinkCollector<'_, '_> {
1268
1268
// doesn't allow statements like `use str::trim;`, making this a (hopefully)
1269
1269
// valid omission. See https://github.com/rust-lang/rust/pull/80660#discussion_r551585677
1270
1270
// for discussion on the matter.
1271
- verify ( kind, id. into ( ) ) ?;
1271
+ verify ( kind, id) ?;
1272
1272
1273
1273
// FIXME: it would be nice to check that the feature gate was enabled in the original crate, not just ignore it altogether.
1274
1274
// However I'm not sure how to check that across crates.
@@ -1306,9 +1306,9 @@ impl LinkCollector<'_, '_> {
1306
1306
Some ( ItemLink { link : ori_link. link , link_text, did : None , fragment } )
1307
1307
}
1308
1308
Res :: Def ( kind, id) => {
1309
- verify ( kind, id. into ( ) ) ?;
1309
+ verify ( kind, id) ?;
1310
1310
let id = clean:: register_res ( self . cx , rustc_hir:: def:: Res :: Def ( kind, id) ) ;
1311
- Some ( ItemLink { link : ori_link. link , link_text, did : Some ( id. into ( ) ) , fragment } )
1311
+ Some ( ItemLink { link : ori_link. link , link_text, did : Some ( id) , fragment } )
1312
1312
}
1313
1313
}
1314
1314
}
@@ -1886,7 +1886,7 @@ fn resolution_failure(
1886
1886
name = start;
1887
1887
for ns in [ TypeNS , ValueNS , MacroNS ] {
1888
1888
if let Some ( res) =
1889
- collector. check_full_res ( ns, & start, module_id. into ( ) , & None )
1889
+ collector. check_full_res ( ns, & start, module_id, & None )
1890
1890
{
1891
1891
debug ! ( "found partial_res={:?}" , res) ;
1892
1892
* partial_res = Some ( res) ;
0 commit comments