From b2562fbcbaaafdb06ed343c7473db769a20afd89 Mon Sep 17 00:00:00 2001 From: Esteban Küber Date: Tue, 22 May 2018 19:27:41 -0700 Subject: Tweak `main` type arguments and where clause spans Tweak the spans for error when finding type arguments or where clauses in main and start functions. --- src/test/ui/error-codes/E0131.stderr | 4 ++-- src/test/ui/error-codes/E0646.stderr | 6 +++--- src/test/ui/error-codes/E0647.stderr | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src/test/ui/error-codes') diff --git a/src/test/ui/error-codes/E0131.stderr b/src/test/ui/error-codes/E0131.stderr index 3774e21c214..ba9355763f6 100644 --- a/src/test/ui/error-codes/E0131.stderr +++ b/src/test/ui/error-codes/E0131.stderr @@ -1,8 +1,8 @@ -error[E0131]: main function is not allowed to have type parameters +error[E0131]: `main` function is not allowed to have type parameters --> $DIR/E0131.rs:11:8 | LL | fn main() { - | ^^^ main cannot have type parameters + | ^^^ `main` cannot have type parameters error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0646.stderr b/src/test/ui/error-codes/E0646.stderr index 96da22a643c..7b2de775a10 100644 --- a/src/test/ui/error-codes/E0646.stderr +++ b/src/test/ui/error-codes/E0646.stderr @@ -1,8 +1,8 @@ -error[E0646]: main function is not allowed to have a where clause - --> $DIR/E0646.rs:11:1 +error[E0646]: `main` function is not allowed to have a `where` clause + --> $DIR/E0646.rs:11:17 | LL | fn main() where (): Copy {} //~ ERROR [E0646] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | ^^^^^^^^ `main` cannot have a `where` clause error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0647.stderr b/src/test/ui/error-codes/E0647.stderr index f02407dcea6..afd37a7edf4 100644 --- a/src/test/ui/error-codes/E0647.stderr +++ b/src/test/ui/error-codes/E0647.stderr @@ -1,10 +1,8 @@ -error[E0647]: start function is not allowed to have a where clause - --> $DIR/E0647.rs:17:1 +error[E0647]: start function is not allowed to have a `where` clause + --> $DIR/E0647.rs:17:56 | -LL | / fn start(_: isize, _: *const *const u8) -> isize where (): Copy { //~ ERROR [E0647] -LL | | 0 -LL | | } - | |_^ +LL | fn start(_: isize, _: *const *const u8) -> isize where (): Copy { //~ ERROR [E0647] + | ^^^^^^^^ start function cannot have a `where` clause error: aborting due to previous error -- cgit 1.4.1-3-g733a5