about summary refs log tree commit diff
path: root/src/test/ui/generic
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2020-01-20 23:59:17 +0000
committervarkor <github@varkor.com>2020-02-22 00:27:44 +0000
commitd232acdb398c5837f2c95ffe6c38970059451445 (patch)
treec530e536a0326468fe01203ff44ea985742fd4e7 /src/test/ui/generic
parent2a504878c3d1f80581e6b202490e10fe199914da (diff)
downloadrust-d232acdb398c5837f2c95ffe6c38970059451445.tar.gz
rust-d232acdb398c5837f2c95ffe6c38970059451445.zip
Report all errors in `check_generic_arg_count`
Diffstat (limited to 'src/test/ui/generic')
-rw-r--r--src/test/ui/generic/generic-arg-mismatch-recover.rs1
-rw-r--r--src/test/ui/generic/generic-arg-mismatch-recover.stderr18
2 files changed, 4 insertions, 15 deletions
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.rs b/src/test/ui/generic/generic-arg-mismatch-recover.rs
index f4e15fbebce..3e5e2e601f5 100644
--- a/src/test/ui/generic/generic-arg-mismatch-recover.rs
+++ b/src/test/ui/generic/generic-arg-mismatch-recover.rs
@@ -4,7 +4,6 @@ struct Bar<'a>(&'a ());
 
 fn main() {
     Foo::<'static, 'static, ()>(&0); //~ ERROR wrong number of lifetime arguments
-    //~^ ERROR mismatched types
 
     Bar::<'static, 'static, ()>(&()); //~ ERROR wrong number of lifetime arguments
     //~^ ERROR wrong number of type arguments
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.stderr b/src/test/ui/generic/generic-arg-mismatch-recover.stderr
index 4b86212e486..99adb352685 100644
--- a/src/test/ui/generic/generic-arg-mismatch-recover.stderr
+++ b/src/test/ui/generic/generic-arg-mismatch-recover.stderr
@@ -4,28 +4,18 @@ error[E0107]: wrong number of lifetime arguments: expected 1, found 2
 LL |     Foo::<'static, 'static, ()>(&0);
    |                    ^^^^^^^ unexpected lifetime argument
 
-error[E0308]: mismatched types
-  --> $DIR/generic-arg-mismatch-recover.rs:6:33
-   |
-LL |     Foo::<'static, 'static, ()>(&0);
-   |                                 ^^ expected `()`, found integer
-   |
-   = note: expected reference `&'static ()`
-              found reference `&{integer}`
-
 error[E0107]: wrong number of lifetime arguments: expected 1, found 2
-  --> $DIR/generic-arg-mismatch-recover.rs:9:20
+  --> $DIR/generic-arg-mismatch-recover.rs:8:20
    |
 LL |     Bar::<'static, 'static, ()>(&());
    |                    ^^^^^^^ unexpected lifetime argument
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/generic-arg-mismatch-recover.rs:9:29
+  --> $DIR/generic-arg-mismatch-recover.rs:8:29
    |
 LL |     Bar::<'static, 'static, ()>(&());
    |                             ^^ unexpected type argument
 
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0107, E0308.
-For more information about an error, try `rustc --explain E0107`.
+For more information about this error, try `rustc --explain E0107`.