Skip to content

Commit

Permalink
Tidying up some of the line spacing / code formatting for NOTE/ERROR …
Browse files Browse the repository at this point in the history
…annotation to match other files.
  • Loading branch information
leikahing committed Aug 4, 2016
1 parent 6131815 commit 0e75684
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
7 changes: 4 additions & 3 deletions src/test/compile-fail/E0060.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ extern "C" {
}

fn main() {
unsafe { printf(); } //~ ERROR E0060
//~| NOTE expected at least 1 parameter
//~| NOTE the following parameter type was expected
unsafe { printf(); }
//~^ ERROR E0060
//~| NOTE expected at least 1 parameter
//~| NOTE the following parameter type was expected
}
7 changes: 4 additions & 3 deletions src/test/compile-fail/E0061.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
fn f(a: u16, b: &str) {}

fn main() {
f(0); //~ ERROR E0061
//~| NOTE expected 2 parameters
//~| NOTE the following parameter types were expected
f(0);
//~^ ERROR E0061
//~| NOTE expected 2 parameters
//~| NOTE the following parameter types were expected
}
5 changes: 3 additions & 2 deletions src/test/compile-fail/issue-18819.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ fn print_x(_: &Foo<Item=bool>, extra: &str) {
}

fn main() {
print_x(X); //~error this function takes 2 parameters but 1 parameter was supplied
//~^ NOTE the following parameter types were expected: &Foo<Item=bool>, &str
print_x(X);
//~^ ERROR this function takes 2 parameters but 1 parameter was supplied
//~| NOTE the following parameter types were expected: &Foo<Item=bool>, &str
//~| NOTE expected 2 parameters
}
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-3044.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn main() {
needlesArr.iter().fold(|x, y| {
});
//~^^ ERROR this function takes 2 parameters but 1 parameter was supplied
//~^^^ NOTE the following parameter types were expected
//~| NOTE the following parameter types were expected
//~| NOTE expected 2 parameters
// the first error is, um, non-ideal.
}
5 changes: 3 additions & 2 deletions src/test/compile-fail/issue-4935.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// Regression test for issue #4935

fn foo(a: usize) {}
fn main() { foo(5, 6) } //~ ERROR this function takes 1 parameter but 2 parameters were supplied
//~^ NOTE the following parameter type was expected
fn main() { foo(5, 6) }
//~^ ERROR this function takes 1 parameter but 2 parameters were supplied
//~| NOTE the following parameter type was expected
//~| NOTE expected 1 parameter
2 changes: 1 addition & 1 deletion src/test/compile-fail/not-enough-arguments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ fn foo(a: isize, b: isize, c: isize, d:isize) {
fn main() {
foo(1, 2, 3);
//~^ ERROR this function takes 4 parameters but 3
//~^^ NOTE the following parameter types were expected
//~| NOTE the following parameter types were expected
//~| NOTE expected 4 parameters
}

0 comments on commit 0e75684

Please sign in to comment.