user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use {} for Known variant just for more parity

Browse source
This commit is contained in:
Niko Matsakis 2017-07-15 14:47:49 -04:00 • committed by Sean Griffin
parent d4df52cacb
commit d516b263c6
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc/infer/type_variable.rs
View file

@ -79,7 +79,9 @@ struct TypeVariableData<'tcx> {
}
enum TypeVariableValue<'tcx> {
Known(Ty<'tcx>),
Known {
value: Ty<'tcx>
},
Bounded {
default: Option<Default<'tcx>>
}
@ -120,7 +122,7 @@ impl<'tcx> TypeVariableTable<'tcx> {
pub fn default(&self, vid: ty::TyVid) -> Option<Default<'tcx>> {
match &self.values.get(vid.index as usize).value {
&Known(_) => None,
&Known { .. } => None,
&Bounded { ref default, .. } => default.clone()
}
}
@ -161,14 +163,14 @@ impl<'tcx> TypeVariableTable<'tcx> {
let old_value = {
let vid_data = &mut self.values[vid.index as usize];
mem::replace(&mut vid_data.value, TypeVariableValue::Known(ty))
mem::replace(&mut vid_data.value, TypeVariableValue::Known { value: ty })
};
match old_value {
TypeVariableValue::Bounded { default } => {
self.values.record(Instantiate { vid: vid, default: default });
}
TypeVariableValue::Known(old_ty) => {
TypeVariableValue::Known { value: old_ty } => {
bug!("instantiating type variable `{:?}` twice: new-value = {:?}, old-value={:?}",
vid, ty, old_ty)
}
@ -236,7 +238,7 @@ impl<'tcx> TypeVariableTable<'tcx> {
debug_assert!(self.root_var(vid) == vid);
match self.values.get(vid.index as usize).value {
Bounded { .. } => None,
Known(t) => Some(t)
Known { value } => Some(value)
}
}
@ -337,7 +339,7 @@ impl<'tcx> TypeVariableTable<'tcx> {
// created since the snapshot started or not.
let escaping_type = match self.values.get(vid.index as usize).value {
Bounded { .. } => bug!(),
Known(ty) => ty,
Known { value } => value,
};
escaping_types.push(escaping_type);
}