@@ -129,7 +129,7 @@ impl InitializationData<'_, '_> {
129
129
self . uninits . seek_before ( loc) ;
130
130
}
131
131
132
- fn state ( & self , path : MovePathIndex ) -> ( bool , bool ) {
132
+ fn maybe_live_dead ( & self , path : MovePathIndex ) -> ( bool , bool ) {
133
133
( self . inits . contains ( path) , self . uninits . contains ( path) )
134
134
}
135
135
}
@@ -165,13 +165,13 @@ impl<'a, 'b, 'tcx> DropElaborator<'a, 'tcx> for Elaborator<'a, 'b, 'tcx> {
165
165
166
166
fn drop_style ( & self , path : Self :: Path , mode : DropFlagMode ) -> DropStyle {
167
167
let ( ( maybe_live, maybe_dead) , multipart) = match mode {
168
- DropFlagMode :: Shallow => ( self . ctxt . init_data . state ( path) , false ) ,
168
+ DropFlagMode :: Shallow => ( self . ctxt . init_data . maybe_live_dead ( path) , false ) ,
169
169
DropFlagMode :: Deep => {
170
170
let mut some_live = false ;
171
171
let mut some_dead = false ;
172
172
let mut children_count = 0 ;
173
173
on_all_drop_children_bits ( self . tcx ( ) , self . body ( ) , self . ctxt . env , path, |child| {
174
- let ( live, dead) = self . ctxt . init_data . state ( child) ;
174
+ let ( live, dead) = self . ctxt . init_data . maybe_live_dead ( child) ;
175
175
debug ! ( "elaborate_drop: state({:?}) = {:?}" , child, ( live, dead) ) ;
176
176
some_live |= live;
177
177
some_dead |= dead;
@@ -303,7 +303,7 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
303
303
LookupResult :: Exact ( e) => e,
304
304
LookupResult :: Parent ( None ) => continue ,
305
305
LookupResult :: Parent ( Some ( parent) ) => {
306
- let ( _maybe_live, maybe_dead) = self . init_data . state ( parent) ;
306
+ let ( _maybe_live, maybe_dead) = self . init_data . maybe_live_dead ( parent) ;
307
307
if maybe_dead {
308
308
span_bug ! (
309
309
terminator. source_info. span,
@@ -318,7 +318,7 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
318
318
} ;
319
319
320
320
on_all_drop_children_bits ( self . tcx , self . body , self . env , path, |child| {
321
- let ( maybe_live, maybe_dead) = self . init_data . state ( child) ;
321
+ let ( maybe_live, maybe_dead) = self . init_data . maybe_live_dead ( child) ;
322
322
debug ! (
323
323
"collect_drop_flags: collecting {:?} from {:?}@{:?} - {:?}" ,
324
324
child,
0 commit comments