From 06c9c599ed4e602ba691a31dde4a193cf33afc91 Mon Sep 17 00:00:00 2001 From: Bastian Kauschke Date: Fri, 13 Nov 2020 19:12:49 +0100 Subject: [PATCH] lessen restriction in `check_kind_count` --- compiler/rustc_typeck/src/astconv/generics.rs | 2 +- src/test/ui/const-generics/invalid-enum.stderr | 8 ++++---- .../generic-impl-more-params-with-defaults.stderr | 4 ++-- .../generic-type-more-params-with-defaults.stderr | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/rustc_typeck/src/astconv/generics.rs b/compiler/rustc_typeck/src/astconv/generics.rs index 991aabd2faf..5768ed3cdca 100644 --- a/compiler/rustc_typeck/src/astconv/generics.rs +++ b/compiler/rustc_typeck/src/astconv/generics.rs @@ -409,7 +409,7 @@ pub(crate) fn check_generic_arg_count( (required, "") }; - let (spans, label) = if required == permitted && provided > permitted { + let (spans, label) = if provided > permitted { // In the case when the user has provided too many arguments, // we want to point to the unexpected arguments. let spans: Vec = args.args[offset + permitted..offset + provided] diff --git a/src/test/ui/const-generics/invalid-enum.stderr b/src/test/ui/const-generics/invalid-enum.stderr index 965abbc9cb7..edaa0ab527d 100644 --- a/src/test/ui/const-generics/invalid-enum.stderr +++ b/src/test/ui/const-generics/invalid-enum.stderr @@ -32,10 +32,10 @@ LL | let _: Example = Example { x: 0 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 const argument error[E0107]: wrong number of type arguments: expected at most 1, found 2 - --> $DIR/invalid-enum.rs:31:10 + --> $DIR/invalid-enum.rs:31:34 | LL | let _: Example = Example { x: 0 }; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 1 type argument + | ^ unexpected type argument | help: If this generic argument was intended as a const parameter, try surrounding it with braces: | @@ -49,10 +49,10 @@ LL | let _: Example = Example { x: 0 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 const argument error[E0107]: wrong number of type arguments: expected at most 1, found 2 - --> $DIR/invalid-enum.rs:36:10 + --> $DIR/invalid-enum.rs:36:39 | LL | let _: Example = Example { x: 0 }; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 1 type argument + | ^ unexpected type argument | help: If this generic argument was intended as a const parameter, try surrounding it with braces: | diff --git a/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr index 66950d450a1..380e9209e6c 100644 --- a/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr +++ b/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr @@ -1,8 +1,8 @@ error[E0107]: wrong number of type arguments: expected at most 2, found 3 - --> $DIR/generic-impl-more-params-with-defaults.rs:13:5 + --> $DIR/generic-impl-more-params-with-defaults.rs:13:24 | LL | Vec::::new(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type arguments + | ^^^^ unexpected type argument error: aborting due to previous error diff --git a/src/test/ui/generics/generic-type-more-params-with-defaults.stderr b/src/test/ui/generics/generic-type-more-params-with-defaults.stderr index 5031930b1bb..cc296b5105a 100644 --- a/src/test/ui/generics/generic-type-more-params-with-defaults.stderr +++ b/src/test/ui/generics/generic-type-more-params-with-defaults.stderr @@ -1,8 +1,8 @@ error[E0107]: wrong number of type arguments: expected at most 2, found 3 - --> $DIR/generic-type-more-params-with-defaults.rs:9:12 + --> $DIR/generic-type-more-params-with-defaults.rs:9:29 | LL | let _: Vec; - | ^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type arguments + | ^^^^ unexpected type argument error: aborting due to previous error -- 2.44.0