Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2014-10-30 09:13:02 -07:00
parent c10c163377
commit 6fcba8826f
8 changed files with 17 additions and 16 deletions

View file

@ -14,8 +14,8 @@ fn main() {
let f = foo;
let f_closure: || = f;
//~^ ERROR: cannot coerce non-statically resolved bare fn to closure
//~^ HELP: consider embedding the function in a closure
//~^^ HELP: consider embedding the function in a closure
let f_proc: proc() = f;
//~^ ERROR: cannot coerce non-statically resolved bare fn to closure
//~^ HELP: consider embedding the function in a closure
//~^^ HELP: consider embedding the function in a closure
}