bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix rebase issue

Browse source
This commit is contained in:
varkor 2019-04-17 19:18:12 +01:00
parent 972e254106
commit 5cf45bc27a
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/infer/mod.rs
View file

@ -1368,8 +1368,6 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
&self, &self,
vid: ty::ConstVid<'tcx> vid: ty::ConstVid<'tcx>
) -> Result<&'tcx ty::Const<'tcx>, ty::UniverseIndex> { ) -> Result<&'tcx ty::Const<'tcx>, ty::UniverseIndex> {
use self::unify_key::ConstVariableValue;
match self.const_unification_table.borrow_mut().probe_value(vid).val { match self.const_unification_table.borrow_mut().probe_value(vid).val {
ConstVariableValue::Known { value } => Ok(value), ConstVariableValue::Known { value } => Ok(value),
ConstVariableValue::Unknown { universe } => Err(universe), ConstVariableValue::Unknown { universe } => Err(universe),