File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -936,7 +936,7 @@ pub struct Resolver<'a> {
936936    /// `derive(Copy)` marks items they are applied to so they are treated specially later. 
937937     /// Derive macros cannot modify the item themselves and have to store the markers in the global 
938938     /// context, so they attach the markers to derive container IDs using this resolver table. 
939-      copy_derives :  FxHashSet < ExpnId > , 
939+      containers_deriving_copy :  FxHashSet < ExpnId > , 
940940    /// Parent scopes in which the macros were invoked. 
941941     /// FIXME: `derives` are missing in these parent scopes and need to be taken from elsewhere. 
942942     invocation_parent_scopes :  FxHashMap < ExpnId ,  ParentScope < ' a > > , 
@@ -1219,7 +1219,7 @@ impl<'a> Resolver<'a> {
12191219            single_segment_macro_resolutions :  Default :: default ( ) , 
12201220            multi_segment_macro_resolutions :  Default :: default ( ) , 
12211221            builtin_attrs :  Default :: default ( ) , 
1222-             copy_derives :  Default :: default ( ) , 
1222+             containers_deriving_copy :  Default :: default ( ) , 
12231223            active_features : 
12241224                features. declared_lib_features . iter ( ) . map ( |( feat,  ..) | * feat) 
12251225                    . chain ( features. declared_lang_features . iter ( ) . map ( |( feat,  ..) | * feat) ) 
Original file line number Diff line number Diff line change @@ -255,11 +255,11 @@ impl<'a> base::Resolver for Resolver<'a> {
255255    } 
256256
257257    fn  has_derive_copy ( & self ,  expn_id :  ExpnId )  -> bool  { 
258-         self . copy_derives . contains ( & expn_id) 
258+         self . containers_deriving_copy . contains ( & expn_id) 
259259    } 
260260
261261    fn  add_derive_copy ( & mut  self ,  expn_id :  ExpnId )  { 
262-         self . copy_derives . insert ( expn_id) ; 
262+         self . containers_deriving_copy . insert ( expn_id) ; 
263263    } 
264264} 
265265
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments