@@ -293,7 +293,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
293293 ) -> Result < ( Res , Option < String > ) , ErrorKind < ' path > > {
294294 let tcx = self . cx . tcx ;
295295 let no_res = || ResolutionFailure :: NotResolved {
296- module_id : module_id. into ( ) ,
296+ module_id : module_id,
297297 partial_res : None ,
298298 unresolved : path_str. into ( ) ,
299299 } ;
@@ -521,7 +521,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
521521 // but the disambiguator logic expects the associated item.
522522 // Store the kind in a side channel so that only the disambiguator logic looks at it.
523523 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) ) ) ;
525525 }
526526 Ok ( ( res, Some ( fragment) ) )
527527 } ;
@@ -1268,7 +1268,7 @@ impl LinkCollector<'_, '_> {
12681268 // doesn't allow statements like `use str::trim;`, making this a (hopefully)
12691269 // valid omission. See https://github.com/rust-lang/rust/pull/80660#discussion_r551585677
12701270 // for discussion on the matter.
1271- verify ( kind, id. into ( ) ) ?;
1271+ verify ( kind, id) ?;
12721272
12731273 // FIXME: it would be nice to check that the feature gate was enabled in the original crate, not just ignore it altogether.
12741274 // However I'm not sure how to check that across crates.
@@ -1306,9 +1306,9 @@ impl LinkCollector<'_, '_> {
13061306 Some ( ItemLink { link : ori_link. link , link_text, did : None , fragment } )
13071307 }
13081308 Res :: Def ( kind, id) => {
1309- verify ( kind, id. into ( ) ) ?;
1309+ verify ( kind, id) ?;
13101310 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 } )
13121312 }
13131313 }
13141314 }
@@ -1886,7 +1886,7 @@ fn resolution_failure(
18861886 name = start;
18871887 for ns in [ TypeNS , ValueNS , MacroNS ] {
18881888 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 )
18901890 {
18911891 debug ! ( "found partial_res={:?}" , res) ;
18921892 * partial_res = Some ( res) ;
0 commit comments