File tree Expand file tree Collapse file tree 3 files changed +1
-8
lines changed 
compiler/rustc_middle/src 
src/tools/clippy/clippy_lints/src Expand file tree Collapse file tree 3 files changed +1
-8
lines changed Original file line number Diff line number Diff line change @@ -2264,9 +2264,6 @@ rustc_queries! {
22642264    query maybe_unused_trait_imports( _:  ( ) )  -> & ' tcx FxIndexSet <LocalDefId > { 
22652265        desc {  "fetching potentially unused trait imports"  } 
22662266    } 
2267-     query names_imported_by_glob_use( def_id:  LocalDefId )  -> & ' tcx FxIndexSet <Symbol > { 
2268-         desc {  |tcx| "finding names imported by glob use for `{}`" ,  tcx. def_path_str( def_id)  } 
2269-     } 
22702267
22712268    query stability_index( _:  ( ) )  -> & ' tcx stability:: Index  { 
22722269        arena_cache
Original file line number Diff line number Diff line change @@ -3413,10 +3413,6 @@ pub struct DeducedParamAttrs {
34133413pub  fn  provide ( providers :  & mut  Providers )  { 
34143414    providers. maybe_unused_trait_imports  =
34153415        |tcx,  ( ) | & tcx. resolutions ( ( ) ) . maybe_unused_trait_imports ; 
3416-     providers. names_imported_by_glob_use  = |tcx,  id| { 
3417-         tcx. arena . alloc ( tcx. resolutions ( ( ) ) . glob_map . get ( & id) . cloned ( ) . unwrap_or_default ( ) ) 
3418-     } ; 
3419- 
34203416    providers. extern_mod_stmt_cnum  =
34213417        |tcx,  id| tcx. resolutions ( ( ) ) . extern_crate_map . get ( & id) . cloned ( ) ; 
34223418    providers. is_panic_runtime  =
Original file line number Diff line number Diff line change @@ -130,7 +130,7 @@ impl LateLintPass<'_> for WildcardImports {
130130        } 
131131        if  let  ItemKind :: Use ( use_path,  UseKind :: Glob )  = & item. kind 
132132            && ( self . warn_on_all  || !self . check_exceptions ( cx,  item,  use_path. segments ) ) 
133-             && let  used_imports = cx. tcx . names_imported_by_glob_use ( item. owner_id . def_id ) 
133+             && let  Some ( used_imports)  = cx. tcx . resolutions ( ( ) ) . glob_map . get ( & item. owner_id . def_id ) 
134134            && !used_imports. is_empty ( )  // Already handled by `unused_imports` 
135135            && !used_imports. contains ( & kw:: Underscore ) 
136136        { 
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments