about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2020-03-28 13:48:04 -0700
committerEsteban Küber <esteban@kuber.com.ar>2020-03-28 13:48:04 -0700
commit33d793c326a83ed2e71a4d5e612526cf13c890b2 (patch)
treeef2d999b0b7979216f9c2c5f98bf936aeb6c75dd /src/test
parentb9d5ee567652cd342d9348c215009049551747b0 (diff)
downloadrust-33d793c326a83ed2e71a4d5e612526cf13c890b2.tar.gz
rust-33d793c326a83ed2e71a4d5e612526cf13c890b2.zip
Point at all constraints before args
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/parser/issue-32214.stderr2
-rw-r--r--src/test/ui/suggestions/suggest-move-types.stderr96
2 files changed, 58 insertions, 40 deletions
diff --git a/src/test/ui/parser/issue-32214.stderr b/src/test/ui/parser/issue-32214.stderr
index 742f4fdc38b..6bb1425ee13 100644
--- a/src/test/ui/parser/issue-32214.stderr
+++ b/src/test/ui/parser/issue-32214.stderr
@@ -4,7 +4,7 @@ error: generic arguments must come before the first constraint
 LL | pub fn test<W, I: Trait<Item=(), W> >() {}
    |                         -------  ^ generic argument
    |                         |
-   |                         the first constraint is provided here
+   |                         the constraint is provided here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/suggest-move-types.stderr b/src/test/ui/suggestions/suggest-move-types.stderr
index 4dd0613757a..b4cf0deacee 100644
--- a/src/test/ui/suggestions/suggest-move-types.stderr
+++ b/src/test/ui/suggestions/suggest-move-types.stderr
@@ -4,7 +4,7 @@ error: generic arguments must come before the first constraint
 LL | struct A<T, M: One<A=(), T>> {
    |                    ----  ^ generic argument
    |                    |
-   |                    the first constraint is provided here
+   |                    the constraint is provided here
 
 error: generic arguments must come before the first constraint
   --> $DIR/suggest-move-types.rs:33:43
@@ -13,70 +13,88 @@ LL | struct Al<'a, T, M: OneWithLifetime<A=(), T, 'a>> {
    |                                     ----  ^  ^^ generic argument
    |                                     |     |
    |                                     |     generic argument
-   |                                     the first constraint is provided here
+   |                                     the constraint is provided here
 
 error: generic arguments must come before the first constraint
   --> $DIR/suggest-move-types.rs:40:46
    |
 LL | struct B<T, U, V, M: Three<A=(), B=(), C=(), T, U, V>> {
-   |                            ----              ^  ^  ^ generic argument
-   |                            |                 |  |
-   |                            |                 |  generic argument
-   |                            |                 generic argument
-   |                            the first constraint is provided here
+   |                            ----  ----  ----  ^  ^  ^ generic argument
+   |                            |     |     |     |  |
+   |                            |     |     |     |  generic argument
+   |                            |     |     |     generic argument
+   |                            |     |     the constraints are provided here
+   |                            |     the constraints are provided here
+   |                            the constraints are provided here
 
 error: generic arguments must come before the first constraint
   --> $DIR/suggest-move-types.rs:48:71
    |
 LL | struct Bl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<A=(), B=(), C=(), T, U, V, 'a, 'b, 'c>> {
-   |                                                     ----              ^  ^  ^  ^^  ^^  ^^ generic argument
-   |                                                     |                 |  |  |  |   |
-   |                                                     |                 |  |  |  |   generic argument
-   |                                                     |                 |  |  |  generic argument
-   |                                                     |                 |  |  generic argument
-   |                                                     |                 |  generic argument
-   |                                                     |                 generic argument
-   |                                                     the first constraint is provided here
+   |                                                     ----  ----  ----  ^  ^  ^  ^^  ^^  ^^ generic argument
+   |                                                     |     |     |     |  |  |  |   |
+   |                                                     |     |     |     |  |  |  |   generic argument
+   |                                                     |     |     |     |  |  |  generic argument
+   |                                                     |     |     |     |  |  generic argument
+   |                                                     |     |     |     |  generic argument
+   |                                                     |     |     |     generic argument
+   |                                                     |     |     the constraints are provided here
+   |                                                     |     the constraints are provided here
+   |                                                     the constraints are provided here
 
 error: generic arguments must come before the first constraint
-  --> $DIR/suggest-move-types.rs:57:49
+  --> $DIR/suggest-move-types.rs:57:28
    |
 LL | struct C<T, U, V, M: Three<T, A=(), B=(), C=(), U, V>> {
-   |                               ----              ^  ^ generic argument
-   |                               |                 |
-   |                               |                 generic argument
-   |                               the first constraint is provided here
+   |                            ^  ----  ----  ----  ^  ^ generic argument
+   |                            |  |     |     |     |
+   |                            |  |     |     |     generic argument
+   |                            |  |     |     the constraints are provided here
+   |                            |  |     the constraints are provided here
+   |                            |  the constraints are provided here
+   |                            generic argument
 
 error: generic arguments must come before the first constraint
-  --> $DIR/suggest-move-types.rs:65:78
+  --> $DIR/suggest-move-types.rs:65:53
    |
 LL | struct Cl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), C=(), U, 'b, V, 'c>> {
-   |                                                            ----              ^  ^^  ^  ^^ generic argument
-   |                                                            |                 |  |   |
-   |                                                            |                 |  |   generic argument
-   |                                                            |                 |  generic argument
-   |                                                            |                 generic argument
-   |                                                            the first constraint is provided here
+   |                                                     ^  ^^  ----  ----  ----  ^  ^^  ^  ^^ generic argument
+   |                                                     |  |   |     |     |     |  |   |
+   |                                                     |  |   |     |     |     |  |   generic argument
+   |                                                     |  |   |     |     |     |  generic argument
+   |                                                     |  |   |     |     |     generic argument
+   |                                                     |  |   |     |     the constraints are provided here
+   |                                                     |  |   |     the constraints are provided here
+   |                                                     |  |   the constraints are provided here
+   |                                                     |  generic argument
+   |                                                     generic argument
 
 error: generic arguments must come before the first constraint
-  --> $DIR/suggest-move-types.rs:74:43
+  --> $DIR/suggest-move-types.rs:74:28
    |
 LL | struct D<T, U, V, M: Three<T, A=(), B=(), U, C=(), V>> {
-   |                               ----        ^        ^ generic argument
-   |                               |           |
-   |                               |           generic argument
-   |                               the first constraint is provided here
+   |                            ^  ----  ----  ^  ----  ^ generic argument
+   |                            |  |     |     |  |
+   |                            |  |     |     |  the constraints are provided here
+   |                            |  |     |     generic argument
+   |                            |  |     the constraints are provided here
+   |                            |  the constraints are provided here
+   |                            generic argument
 
 error: generic arguments must come before the first constraint
-  --> $DIR/suggest-move-types.rs:82:72
+  --> $DIR/suggest-move-types.rs:82:53
    |
 LL | struct Dl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), U, 'b, C=(), V, 'c>> {
-   |                                                            ----        ^  ^^        ^  ^^ generic argument
-   |                                                            |           |  |         |
-   |                                                            |           |  |         generic argument
-   |                                                            |           |  generic argument
-   |                                                            |           generic argument
-   |                                                            the first constraint is provided here
+   |                                                     ^  ^^  ----  ----  ^  ^^  ----  ^  ^^ generic argument
+   |                                                     |  |   |     |     |  |   |     |
+   |                                                     |  |   |     |     |  |   |     generic argument
+   |                                                     |  |   |     |     |  |   the constraints are provided here
+   |                                                     |  |   |     |     |  generic argument
+   |                                                     |  |   |     |     generic argument
+   |                                                     |  |   |     the constraints are provided here
+   |                                                     |  |   the constraints are provided here
+   |                                                     |  generic argument
+   |                                                     generic argument
 
 error[E0747]: type provided when a lifetime was expected
   --> $DIR/suggest-move-types.rs:33:43