diff options
| author | varkor <github@varkor.com> | 2018-08-08 00:38:31 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2018-08-19 20:03:02 +0100 |
| commit | 04d33bbdb3ca017a31f9f84218d894475a2d4a0a (patch) | |
| tree | 338ca06f3765e9ff1f8d49accbf091fe7714bd6f /src/test/ui/error-codes | |
| parent | 68b0e7dd99ff374adf1babc481e415bad133cba7 (diff) | |
Refactor generic argument count check in check/mod.rs
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0087.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0087.stderr | 16 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0088.stderr | 12 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0089.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0089.stderr | 6 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0090.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0090.stderr | 6 |
7 files changed, 24 insertions, 24 deletions
diff --git a/src/test/ui/error-codes/E0087.rs b/src/test/ui/error-codes/E0087.rs index 6dc08860614..bea76f34220 100644 --- a/src/test/ui/error-codes/E0087.rs +++ b/src/test/ui/error-codes/E0087.rs @@ -12,7 +12,7 @@ fn foo() {} fn bar<T>() {} fn main() { - foo::<f64>(); //~ ERROR expected at most 0 type parameters, found 1 type parameter [E0087] + foo::<f64>(); //~ ERROR wrong number of type arguments: expected 0, found 1 [E0087] - bar::<f64, u64>(); //~ ERROR expected at most 1 type parameter, found 2 type parameters [E0087] + bar::<f64, u64>(); //~ ERROR wrong number of type arguments: expected 1, found 2 [E0087] } diff --git a/src/test/ui/error-codes/E0087.stderr b/src/test/ui/error-codes/E0087.stderr index cd1e99e7b41..7170a6f2cda 100644 --- a/src/test/ui/error-codes/E0087.stderr +++ b/src/test/ui/error-codes/E0087.stderr @@ -1,14 +1,14 @@ -error[E0087]: too many type parameters provided: expected at most 0 type parameters, found 1 type parameter - --> $DIR/E0087.rs:15:11 +error[E0087]: wrong number of type arguments: expected 0, found 1 + --> $DIR/E0087.rs:15:5 | -LL | foo::<f64>(); //~ ERROR expected at most 0 type parameters, found 1 type parameter [E0087] - | ^^^ expected 0 type parameters +LL | foo::<f64>(); //~ ERROR wrong number of type arguments: expected 0, found 1 [E0087] + | ^^^^^^^^^^ unexpected type argument -error[E0087]: too many type parameters provided: expected at most 1 type parameter, found 2 type parameters - --> $DIR/E0087.rs:17:16 +error[E0087]: wrong number of type arguments: expected 1, found 2 + --> $DIR/E0087.rs:17:5 | -LL | bar::<f64, u64>(); //~ ERROR expected at most 1 type parameter, found 2 type parameters [E0087] - | ^^^ expected 1 type parameter +LL | bar::<f64, u64>(); //~ ERROR wrong number of type arguments: expected 1, found 2 [E0087] + | ^^^^^^^^^^^^^^^ unexpected type argument error: aborting due to 2 previous errors diff --git a/src/test/ui/error-codes/E0088.stderr b/src/test/ui/error-codes/E0088.stderr index 4bf2760994e..4666702e1eb 100644 --- a/src/test/ui/error-codes/E0088.stderr +++ b/src/test/ui/error-codes/E0088.stderr @@ -1,14 +1,14 @@ -error[E0088]: too many lifetime parameters provided: expected at most 0 lifetime parameters, found 1 lifetime parameter - --> $DIR/E0088.rs:15:9 +error[E0088]: wrong number of lifetime arguments: expected 0, found 1 + --> $DIR/E0088.rs:15:5 | LL | f::<'static>(); //~ ERROR E0088 - | ^^^^^^^ expected 0 lifetime parameters + | ^^^^^^^^^^^^ unexpected lifetime argument -error[E0088]: too many lifetime parameters provided: expected at most 1 lifetime parameter, found 2 lifetime parameters - --> $DIR/E0088.rs:16:18 +error[E0088]: wrong number of lifetime arguments: expected 1, found 2 + --> $DIR/E0088.rs:16:5 | LL | g::<'static, 'static>(); //~ ERROR E0088 - | ^^^^^^^ expected 1 lifetime parameter + | ^^^^^^^^^^^^^^^^^^^^^ unexpected lifetime argument error: aborting due to 2 previous errors diff --git a/src/test/ui/error-codes/E0089.rs b/src/test/ui/error-codes/E0089.rs index 21df9abd093..4e6196a7b89 100644 --- a/src/test/ui/error-codes/E0089.rs +++ b/src/test/ui/error-codes/E0089.rs @@ -11,5 +11,5 @@ fn foo<T, U>() {} fn main() { - foo::<f64>(); //~ ERROR expected 2 type parameters, found 1 type parameter [E0089] + foo::<f64>(); //~ ERROR wrong number of type arguments: expected 2, found 1 [E0089] } diff --git a/src/test/ui/error-codes/E0089.stderr b/src/test/ui/error-codes/E0089.stderr index 0b95033fb36..f79c478b733 100644 --- a/src/test/ui/error-codes/E0089.stderr +++ b/src/test/ui/error-codes/E0089.stderr @@ -1,8 +1,8 @@ -error[E0089]: too few type parameters provided: expected 2 type parameters, found 1 type parameter +error[E0089]: wrong number of type arguments: expected 2, found 1 --> $DIR/E0089.rs:14:5 | -LL | foo::<f64>(); //~ ERROR expected 2 type parameters, found 1 type parameter [E0089] - | ^^^^^^^^^^ expected 2 type parameters +LL | foo::<f64>(); //~ ERROR wrong number of type arguments: expected 2, found 1 [E0089] + | ^^^^^^^^^^ expected 2 type arguments error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0090.rs b/src/test/ui/error-codes/E0090.rs index 13b2131cc8b..26be4c12f07 100644 --- a/src/test/ui/error-codes/E0090.rs +++ b/src/test/ui/error-codes/E0090.rs @@ -11,5 +11,5 @@ fn foo<'a: 'b, 'b: 'a>() {} fn main() { - foo::<'static>(); //~ ERROR expected 2 lifetime parameters, found 1 lifetime parameter [E0090] + foo::<'static>(); //~ ERROR wrong number of lifetime arguments: expected 2, found 1 [E0090] } diff --git a/src/test/ui/error-codes/E0090.stderr b/src/test/ui/error-codes/E0090.stderr index f119d5fa467..9029b6c2708 100644 --- a/src/test/ui/error-codes/E0090.stderr +++ b/src/test/ui/error-codes/E0090.stderr @@ -1,8 +1,8 @@ -error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter +error[E0090]: wrong number of lifetime arguments: expected 2, found 1 --> $DIR/E0090.rs:14:5 | -LL | foo::<'static>(); //~ ERROR expected 2 lifetime parameters, found 1 lifetime parameter [E0090] - | ^^^^^^^^^^^^^^ expected 2 lifetime parameters +LL | foo::<'static>(); //~ ERROR wrong number of lifetime arguments: expected 2, found 1 [E0090] + | ^^^^^^^^^^^^^^ expected 2 lifetime arguments error: aborting due to previous error |
