From bbdcc4e7ce697bbd6ad398987c5e4ec4928f5da4 Mon Sep 17 00:00:00 2001 From: varkor Date: Thu, 7 Feb 2019 10:10:11 +0100 Subject: Adjust parser generic parameter errors --- src/test/ui/issues/issue-20616-3.rs | 5 ++--- src/test/ui/issues/issue-20616-3.stderr | 4 ++-- src/test/ui/issues/issue-20616-7.rs | 5 ++--- src/test/ui/issues/issue-20616-7.stderr | 4 ++-- src/test/ui/issues/issue-20616-8.rs | 5 ++--- src/test/ui/issues/issue-20616-8.stderr | 4 ++-- src/test/ui/issues/issue-20616-9.rs | 5 ++--- src/test/ui/issues/issue-20616-9.stderr | 4 ++-- 8 files changed, 16 insertions(+), 20 deletions(-) (limited to 'src/test/ui/issues') diff --git a/src/test/ui/issues/issue-20616-3.rs b/src/test/ui/issues/issue-20616-3.rs index 9f983f74f5b..9bfd5bf2313 100644 --- a/src/test/ui/issues/issue-20616-3.rs +++ b/src/test/ui/issues/issue-20616-3.rs @@ -1,5 +1,3 @@ -// ignore-tidy-linelength - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time @@ -12,7 +10,8 @@ type Type_1_<'a, T> = &'a T; //type Type_2 = Type_1_<'static ()>; // error: expected `,` or `>` after lifetime name, found `(` -type Type_3 = Box; //~ error: expected one of `>`, const, identifier, lifetime, or type, found `,` +type Type_3 = Box; +//~^ error: expected one of `>`, const, identifier, lifetime, or type, found `,` //type Type_4 = Type_1_<'static,, T>; // error: expected type, found `,` diff --git a/src/test/ui/issues/issue-20616-3.stderr b/src/test/ui/issues/issue-20616-3.stderr index e8edb5ba70f..f51fb949c74 100644 --- a/src/test/ui/issues/issue-20616-3.stderr +++ b/src/test/ui/issues/issue-20616-3.stderr @@ -1,7 +1,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-3.rs:15:24 + --> $DIR/issue-20616-3.rs:13:24 | -LL | type Type_3 = Box; //~ error: expected one of `>`, const, identifier, lifetime, or type, found `,` +LL | type Type_3 = Box; | ^ expected one of `>`, const, identifier, lifetime, or type here error: aborting due to previous error diff --git a/src/test/ui/issues/issue-20616-7.rs b/src/test/ui/issues/issue-20616-7.rs index 277b4524506..ffd1620c1d3 100644 --- a/src/test/ui/issues/issue-20616-7.rs +++ b/src/test/ui/issues/issue-20616-7.rs @@ -1,5 +1,3 @@ -// ignore-tidy-linelength - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time @@ -27,7 +25,8 @@ type Type_5_<'a> = Type_1_<'a, ()>; //type Type_6 = Type_5_<'a,,>; // error: expected type, found `,` -type Type_7 = Box<(),,>; //~ error: expected one of `>`, const, identifier, lifetime, or type, found `,` +type Type_7 = Box<(),,>; +//~^ error: expected one of `>`, const, identifier, lifetime, or type, found `,` //type Type_8<'a,,> = &'a (); // error: expected ident, found `,` diff --git a/src/test/ui/issues/issue-20616-7.stderr b/src/test/ui/issues/issue-20616-7.stderr index c1422d849fc..c0e108375be 100644 --- a/src/test/ui/issues/issue-20616-7.stderr +++ b/src/test/ui/issues/issue-20616-7.stderr @@ -1,7 +1,7 @@ error: expected one of `>`, const, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-7.rs:30:22 + --> $DIR/issue-20616-7.rs:28:22 | -LL | type Type_7 = Box<(),,>; //~ error: expected one of `>`, const, identifier, lifetime, or type, found `,` +LL | type Type_7 = Box<(),,>; | ^ expected one of `>`, const, identifier, lifetime, or type here error: aborting due to previous error diff --git a/src/test/ui/issues/issue-20616-8.rs b/src/test/ui/issues/issue-20616-8.rs index 756119e0127..c9e8b61e50b 100644 --- a/src/test/ui/issues/issue-20616-8.rs +++ b/src/test/ui/issues/issue-20616-8.rs @@ -1,5 +1,3 @@ -// ignore-tidy-linelength - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time @@ -30,7 +28,8 @@ type Type_5_<'a> = Type_1_<'a, ()>; //type Type_7 = Box<(),,>; // error: expected type, found `,` -type Type_8<'a,,> = &'a (); //~ error: expected one of `>`, `const`, identifier, or lifetime, found `,` +type Type_8<'a,,> = &'a (); +//~^ error: expected one of `>`, `const`, identifier, or lifetime, found `,` //type Type_9 = Box; // error: expected identifier, found `,` diff --git a/src/test/ui/issues/issue-20616-8.stderr b/src/test/ui/issues/issue-20616-8.stderr index cfe3ec57712..0ef9192f1e7 100644 --- a/src/test/ui/issues/issue-20616-8.stderr +++ b/src/test/ui/issues/issue-20616-8.stderr @@ -1,7 +1,7 @@ error: expected one of `>`, `const`, identifier, or lifetime, found `,` - --> $DIR/issue-20616-8.rs:33:16 + --> $DIR/issue-20616-8.rs:31:16 | -LL | type Type_8<'a,,> = &'a (); //~ error: expected one of `>`, `const`, identifier, or lifetime, found `,` +LL | type Type_8<'a,,> = &'a (); | ^ expected one of `>`, `const`, identifier, or lifetime here error: aborting due to previous error diff --git a/src/test/ui/issues/issue-20616-9.rs b/src/test/ui/issues/issue-20616-9.rs index 6074fbb2204..1c509f26fd6 100644 --- a/src/test/ui/issues/issue-20616-9.rs +++ b/src/test/ui/issues/issue-20616-9.rs @@ -1,5 +1,3 @@ -// ignore-tidy-linelength - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time @@ -33,4 +31,5 @@ type Type_5_<'a> = Type_1_<'a, ()>; //type Type_8<'a,,> = &'a (); // error: expected identifier, found `,` -type Type_9 = Box; //~ error: expected one of `>`, `const`, identifier, or lifetime, found `,` +type Type_9 = Box; +//~^ error: expected one of `>`, `const`, identifier, or lifetime, found `,` diff --git a/src/test/ui/issues/issue-20616-9.stderr b/src/test/ui/issues/issue-20616-9.stderr index 960e8c8c086..5fd1400a2e8 100644 --- a/src/test/ui/issues/issue-20616-9.stderr +++ b/src/test/ui/issues/issue-20616-9.stderr @@ -1,7 +1,7 @@ error: expected one of `>`, `const`, identifier, or lifetime, found `,` - --> $DIR/issue-20616-9.rs:36:15 + --> $DIR/issue-20616-9.rs:34:15 | -LL | type Type_9 = Box; //~ error: expected one of `>`, `const`, identifier, or lifetime, found `,` +LL | type Type_9 = Box; | ^ expected one of `>`, `const`, identifier, or lifetime here error: aborting due to previous error -- cgit 1.4.1-3-g733a5