Do not return the result from sub/equate routines, just return a.
This commit is contained in:
parent
c8ded9a14f
commit
01872f7b91
3 changed files with 34 additions and 2 deletions
|
@ -68,7 +68,8 @@ impl<'a, 'tcx> TypeRelation<'a,'tcx> for Equate<'a, 'tcx> {
|
||||||
}
|
}
|
||||||
|
|
||||||
_ => {
|
_ => {
|
||||||
combine::super_combine_tys(self.fields.infcx, self, a, b)
|
try!(combine::super_combine_tys(self.fields.infcx, self, a, b));
|
||||||
|
Ok(a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,7 +90,8 @@ impl<'a, 'tcx> TypeRelation<'a, 'tcx> for Sub<'a, 'tcx> {
|
||||||
}
|
}
|
||||||
|
|
||||||
_ => {
|
_ => {
|
||||||
combine::super_combine_tys(self.fields.infcx, self, a, b)
|
try!(combine::super_combine_tys(self.fields.infcx, self, a, b));
|
||||||
|
Ok(a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
30
src/test/run-pass/issue-28279.rs
Normal file
30
src/test/run-pass/issue-28279.rs
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
fn test1() -> Rc<for<'a> Fn(&'a usize) + 'static> {
|
||||||
|
if let Some(_) = Some(1) {
|
||||||
|
loop{}
|
||||||
|
} else {
|
||||||
|
loop{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test2() -> *mut for<'a> Fn(&'a usize) + 'static {
|
||||||
|
if let Some(_) = Some(1) {
|
||||||
|
loop{}
|
||||||
|
} else {
|
||||||
|
loop{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
||||||
|
|
Loading…
Reference in a new issue