@@ -360,11 +360,11 @@ impl<'t, I: Interner> Unifier<'t, I> {
360
360
fn unify_var_var ( & mut self , a : InferenceVar , b : InferenceVar ) -> Fallible < ( ) > {
361
361
let var1 = EnaVariable :: from ( a) ;
362
362
let var2 = EnaVariable :: from ( b) ;
363
- Ok ( self
364
- . table
363
+ self . table
365
364
. unify
366
365
. unify_var_var ( var1, var2)
367
- . expect ( "unification of two unbound variables cannot fail" ) )
366
+ . expect ( "unification of two unbound variables cannot fail" ) ;
367
+ Ok ( ( ) )
368
368
}
369
369
370
370
/// Unify a general inference variable with a specific inference variable
@@ -1001,7 +1001,8 @@ impl<'t, I: Interner> Unifier<'t, I> {
1001
1001
| ( & LifetimeData :: Erased , & LifetimeData :: Placeholder ( _) )
1002
1002
| ( & LifetimeData :: Erased , & LifetimeData :: Empty ( _) ) => {
1003
1003
if a != b {
1004
- Ok ( self . push_lifetime_outlives_goals ( variance, a. clone ( ) , b. clone ( ) ) )
1004
+ self . push_lifetime_outlives_goals ( variance, a. clone ( ) , b. clone ( ) ) ;
1005
+ Ok ( ( ) )
1005
1006
} else {
1006
1007
Ok ( ( ) )
1007
1008
}
@@ -1041,11 +1042,12 @@ impl<'t, I: Interner> Unifier<'t, I> {
1041
1042
"{:?} in {:?} cannot see {:?}; pushing constraint" ,
1042
1043
var, var_ui, value_ui
1043
1044
) ;
1044
- Ok ( self . push_lifetime_outlives_goals (
1045
+ self . push_lifetime_outlives_goals (
1045
1046
variance,
1046
1047
var. to_lifetime ( self . interner ) ,
1047
1048
value. clone ( ) ,
1048
- ) )
1049
+ ) ;
1050
+ Ok ( ( ) )
1049
1051
}
1050
1052
}
1051
1053
@@ -1082,11 +1084,11 @@ impl<'t, I: Interner> Unifier<'t, I> {
1082
1084
debug ! ( ?var1, ?var2, "relate_ty_ty" ) ;
1083
1085
let var1 = EnaVariable :: from ( var1) ;
1084
1086
let var2 = EnaVariable :: from ( var2) ;
1085
- Ok ( self
1086
- . table
1087
+ self . table
1087
1088
. unify
1088
1089
. unify_var_var ( var1, var2)
1089
- . expect ( "unification of two unbound variables cannot fail" ) )
1090
+ . expect ( "unification of two unbound variables cannot fail" ) ;
1091
+ Ok ( ( ) )
1090
1092
}
1091
1093
1092
1094
// Unifying an inference variables with a non-inference variable.
0 commit comments