@@ -79,7 +79,9 @@ struct TypeVariableData<'tcx> {
79
79
}
80
80
81
81
enum TypeVariableValue < ' tcx > {
82
- Known ( Ty < ' tcx > ) ,
82
+ Known {
83
+ value : Ty < ' tcx >
84
+ } ,
83
85
Bounded {
84
86
default : Option < Default < ' tcx > >
85
87
}
@@ -120,7 +122,7 @@ impl<'tcx> TypeVariableTable<'tcx> {
120
122
121
123
pub fn default ( & self , vid : ty:: TyVid ) -> Option < Default < ' tcx > > {
122
124
match & self . values . get ( vid. index as usize ) . value {
123
- & Known ( _ ) => None ,
125
+ & Known { .. } => None ,
124
126
& Bounded { ref default, .. } => default. clone ( )
125
127
}
126
128
}
@@ -161,14 +163,14 @@ impl<'tcx> TypeVariableTable<'tcx> {
161
163
162
164
let old_value = {
163
165
let vid_data = & mut self . values [ vid. index as usize ] ;
164
- mem:: replace ( & mut vid_data. value , TypeVariableValue :: Known ( ty ) )
166
+ mem:: replace ( & mut vid_data. value , TypeVariableValue :: Known { value : ty } )
165
167
} ;
166
168
167
169
match old_value {
168
170
TypeVariableValue :: Bounded { default } => {
169
171
self . values . record ( Instantiate { vid : vid, default : default } ) ;
170
172
}
171
- TypeVariableValue :: Known ( old_ty) => {
173
+ TypeVariableValue :: Known { value : old_ty } => {
172
174
bug ! ( "instantiating type variable `{:?}` twice: new-value = {:?}, old-value={:?}" ,
173
175
vid, ty, old_ty)
174
176
}
@@ -236,7 +238,7 @@ impl<'tcx> TypeVariableTable<'tcx> {
236
238
debug_assert ! ( self . root_var( vid) == vid) ;
237
239
match self . values . get ( vid. index as usize ) . value {
238
240
Bounded { .. } => None ,
239
- Known ( t ) => Some ( t )
241
+ Known { value } => Some ( value )
240
242
}
241
243
}
242
244
@@ -337,7 +339,7 @@ impl<'tcx> TypeVariableTable<'tcx> {
337
339
// created since the snapshot started or not.
338
340
let escaping_type = match self . values . get ( vid. index as usize ) . value {
339
341
Bounded { .. } => bug ! ( ) ,
340
- Known ( ty ) => ty ,
342
+ Known { value } => value ,
341
343
} ;
342
344
escaping_types. push ( escaping_type) ;
343
345
}
0 commit comments