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

Fix some merge conflicts

Browse source
This commit is contained in:
Niko Matsakis 2015-06-24 10:17:31 -04:00
parent 65a456df43
commit db5f3bc65c
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/compile-fail/object-lifetime-default.rs
View file

@ -29,6 +29,6 @@ struct E<'a,'b:'a,T:'b>(&'a T, &'b T); //~ ERROR 'b
struct F<'a,'b,T:'a,U:'b>(&'a T, &'b U); //~ ERROR 'a,'b
#[rustc_object_lifetime_default]
struct G<'a,'b,T:'a,U:'a+'b>(&'a T, &'b U); //~ ERROR 'a,Some(Ambiguous)
struct G<'a,'b,T:'a,U:'a+'b>(&'a T, &'b U); //~ ERROR 'a,Ambiguous
fn main() { }