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

Correct merge errors, broken tests

Browse source
This commit is contained in:
Niko Matsakis 2013-07-01 20:43:42 -04:00
parent 4a0469e3d7
commit ef5c439fb0
6 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/compile-fail/regions-bounds.rs
View file

@ -16,12 +16,12 @@ struct an_enum<'self>(&'self int);
struct a_class<'self> { x:&'self int }
fn a_fn1<'a,'b>(e: an_enum<'a>) -> an_enum<'b> {
return e; //~ ERROR mismatched types: expected `an_enum<'b> ` but found `an_enum<'a> `
return e; //~ ERROR mismatched types: expected `an_enum<'b>` but found `an_enum<'a>`
//~^ ERROR cannot infer an appropriate lifetime
}
fn a_fn3<'a,'b>(e: a_class<'a>) -> a_class<'b> {
return e; //~ ERROR mismatched types: expected `a_class<'b> ` but found `a_class<'a> `
return e; //~ ERROR mismatched types: expected `a_class<'b>` but found `a_class<'a>`
//~^ ERROR cannot infer an appropriate lifetime
}