update help message

lcnr · lcnr · commit 0c511ab5c7fa · 2020-07-16T11:13:05.000+02:00
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
@@ -442,14 +442,17 @@ impl<'a> Resolver<'a> {
                 );
                 err
             }
-            ResolutionError::ParamInTyOfConstArg => {
+            ResolutionError::ParamInTyOfConstArg(name) => {
                 let mut err = struct_span_err!(
                     self.session,
                     span,
                     E0770,
                     "the type of const parameters must not depend on other generic parameters"
                 );
-                err.span_label(span, "const parameters must have a concrete type");
+                err.span_label(
+                    span,
+                    format!("the type must not depend on the parameter `{}`", name),
+                );
                 err
             }
             ResolutionError::SelfInTyParamDefault => {
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
@@ -215,7 +215,7 @@ enum ResolutionError<'a> {
     /// Error E0128: type parameters with a default cannot use forward-declared identifiers.
     ForwardDeclaredTyParam, // FIXME(const_generics:defaults)
     /// ERROR E0770: the type of const parameters must not depend on other generic parameters.
-    ParamInTyOfConstArg,
+    ParamInTyOfConstArg(Symbol),
     /// Error E0735: type parameters with a default cannot use `Self`
     SelfInTyParamDefault,
     /// Error E0767: use of unreachable label
@@ -2484,7 +2484,7 @@ impl<'a> Resolver<'a> {
                         }
                         ConstParamTyRibKind => {
                             if record_used {
-                                self.report_error(span, ParamInTyOfConstArg);
+                                self.report_error(span, ParamInTyOfConstArg(rib_ident.name));
                             }
                             return Res::Err;
                         }
@@ -2513,7 +2513,10 @@ impl<'a> Resolver<'a> {
                         FnItemRibKind => HasGenericParams::Yes,
                         ConstParamTyRibKind => {
                             if record_used {
-                                self.report_error(span, ResolutionError::ParamInTyOfConstArg);
+                                self.report_error(
+                                    span,
+                                    ResolutionError::ParamInTyOfConstArg(rib_ident.name),
+                                );
                             }
                             return Res::Err;
                         }
@@ -2552,7 +2555,10 @@ impl<'a> Resolver<'a> {
                         FnItemRibKind => HasGenericParams::Yes,
                         ConstParamTyRibKind => {
                             if record_used {
-                                self.report_error(span, ResolutionError::ParamInTyOfConstArg);
+                                self.report_error(
+                                    span,
+                                    ResolutionError::ParamInTyOfConstArg(rib_ident.name),
+                                );
                             }
                             return Res::Err;
                         }
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-const-param.stderr b/src/test/ui/const-generics/const-param-type-depends-on-const-param.stderr
@@ -2,13 +2,13 @@ error[E0770]: the type of const parameters must not depend on other generic para
   --> $DIR/const-param-type-depends-on-const-param.rs:9:52
    |
 LL | pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);
-   |                                                    ^ const parameters must have a concrete type
+   |                                                    ^ the type must not depend on the parameter `N`
 
 error[E0770]: the type of const parameters must not depend on other generic parameters
   --> $DIR/const-param-type-depends-on-const-param.rs:12:40
    |
 LL | pub struct SelfDependent<const N: [u8; N]>;
-   |                                        ^ const parameters must have a concrete type
+   |                                        ^ the type must not depend on the parameter `N`
 
 warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
   --> $DIR/const-param-type-depends-on-const-param.rs:1:12
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
@@ -2,7 +2,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
   --> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:22
    |
 LL | struct B<T, const N: T>(PhantomData<[T; N]>);
-   |                      ^ const parameters must have a concrete type
+   |                      ^ the type must not depend on the parameter `T`
 
 error[E0658]: const generics are unstable
   --> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:19
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param.stderr b/src/test/ui/const-generics/const-param-type-depends-on-type-param.stderr
@@ -2,7 +2,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
   --> $DIR/const-param-type-depends-on-type-param.rs:9:34
    |
 LL | pub struct Dependent<T, const X: T>([(); X]);
-   |                                  ^ const parameters must have a concrete type
+   |                                  ^ the type must not depend on the parameter `T`
 
 warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
   --> $DIR/const-param-type-depends-on-type-param.rs:1:12
diff --git a/src/test/ui/const-generics/issues/issue-71381.stderr b/src/test/ui/const-generics/issues/issue-71381.stderr
@@ -2,13 +2,13 @@ error[E0770]: the type of const parameters must not depend on other generic para
   --> $DIR/issue-71381.rs:13:82
    |
 LL |     pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "C" fn(Args)>(&self) {
-   |                                                                                  ^^^^ const parameters must have a concrete type
+   |                                                                                  ^^^^ the type must not depend on the parameter `Args`
 
 error[E0770]: the type of const parameters must not depend on other generic parameters
   --> $DIR/issue-71381.rs:22:40
    |
 LL |         const FN: unsafe extern "C" fn(Args),
-   |                                        ^^^^ const parameters must have a concrete type
+   |                                        ^^^^ the type must not depend on the parameter `Args`
 
 error: using function pointers as const generic parameters is forbidden
   --> $DIR/issue-71381.rs:13:61
diff --git a/src/test/ui/const-generics/issues/issue-71611.stderr b/src/test/ui/const-generics/issues/issue-71611.stderr
@@ -2,7 +2,7 @@ error[E0770]: the type of const parameters must not depend on other generic para
   --> $DIR/issue-71611.rs:4:31
    |
 LL | fn func<A, const F: fn(inner: A)>(outer: A) {
-   |                               ^ const parameters must have a concrete type
+   |                               ^ the type must not depend on the parameter `A`
 
 error: using function pointers as const generic parameters is forbidden
   --> $DIR/issue-71611.rs:4:21

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ enum ResolutionError<'a> {`
`215`	`215`	`/// Error E0128: type parameters with a default cannot use forward-declared identifiers.`
`216`	`216`	`ForwardDeclaredTyParam, // FIXME(const_generics:defaults)`
`217`	`217`	`/// ERROR E0770: the type of const parameters must not depend on other generic parameters.`
`218`		`- ParamInTyOfConstArg,`
	`218`	`+ ParamInTyOfConstArg(Symbol),`
`219`	`219`	/// Error E0735: type parameters with a default cannot use `Self`
`220`	`220`	`SelfInTyParamDefault,`
`221`	`221`	`/// Error E0767: use of unreachable label`
`@@ -2484,7 +2484,7 @@ impl<'a> Resolver<'a> {`
`2484`	`2484`	`}`
`2485`	`2485`	`ConstParamTyRibKind => {`
`2486`	`2486`	`if record_used {`
`2487`		`- self.report_error(span, ParamInTyOfConstArg);`
	`2487`	`+ self.report_error(span, ParamInTyOfConstArg(rib_ident.name));`
`2488`	`2488`	`}`
`2489`	`2489`	`return Res::Err;`
`2490`	`2490`	`}`
`@@ -2513,7 +2513,10 @@ impl<'a> Resolver<'a> {`
`2513`	`2513`	`FnItemRibKind => HasGenericParams::Yes,`
`2514`	`2514`	`ConstParamTyRibKind => {`
`2515`	`2515`	`if record_used {`
`2516`		`- self.report_error(span, ResolutionError::ParamInTyOfConstArg);`
	`2516`	`+ self.report_error(`
	`2517`	`+ span,`
	`2518`	`+ ResolutionError::ParamInTyOfConstArg(rib_ident.name),`
	`2519`	`+ );`
`2517`	`2520`	`}`
`2518`	`2521`	`return Res::Err;`
`2519`	`2522`	`}`
`@@ -2552,7 +2555,10 @@ impl<'a> Resolver<'a> {`
`2552`	`2555`	`FnItemRibKind => HasGenericParams::Yes,`
`2553`	`2556`	`ConstParamTyRibKind => {`
`2554`	`2557`	`if record_used {`
`2555`		`- self.report_error(span, ResolutionError::ParamInTyOfConstArg);`
	`2558`	`+ self.report_error(`
	`2559`	`+ span,`
	`2560`	`+ ResolutionError::ParamInTyOfConstArg(rib_ident.name),`
	`2561`	`+ );`
`2556`	`2562`	`}`
`2557`	`2563`	`return Res::Err;`
`2558`	`2564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@ error[E0770]: the type of const parameters must not depend on other generic para`
`2`	`2`	`--> $DIR/const-param-type-depends-on-const-param.rs:9:52`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);`
`5`		`- \| ^ const parameters must have a concrete type`
	`5`	+ \| ^ the type must not depend on the parameter `N`
`6`	`6`
`7`	`7`	`error[E0770]: the type of const parameters must not depend on other generic parameters`
`8`	`8`	`--> $DIR/const-param-type-depends-on-const-param.rs:12:40`
`9`	`9`	`\|`
`10`	`10`	`LL \| pub struct SelfDependent<const N: [u8; N]>;`
`11`		`- \| ^ const parameters must have a concrete type`
	`11`	+ \| ^ the type must not depend on the parameter `N`
`12`	`12`
`13`	`13`	warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
`14`	`14`	`--> $DIR/const-param-type-depends-on-const-param.rs:1:12`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0770]: the type of const parameters must not depend on other generic para`
`2`	`2`	`--> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:22`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct B<T, const N: T>(PhantomData<[T; N]>);`
`5`		`- \| ^ const parameters must have a concrete type`
	`5`	+ \| ^ the type must not depend on the parameter `T`
`6`	`6`
`7`	`7`	`error[E0658]: const generics are unstable`
`8`	`8`	`--> $DIR/const-param-type-depends-on-type-param-ungated.rs:3:19`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0770]: the type of const parameters must not depend on other generic para`
`2`	`2`	`--> $DIR/const-param-type-depends-on-type-param.rs:9:34`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub struct Dependent<T, const X: T>([(); X]);`
`5`		`- \| ^ const parameters must have a concrete type`
	`5`	+ \| ^ the type must not depend on the parameter `T`
`6`	`6`
`7`	`7`	warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
`8`	`8`	`--> $DIR/const-param-type-depends-on-type-param.rs:1:12`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@ error[E0770]: the type of const parameters must not depend on other generic para`
`2`	`2`	`--> $DIR/issue-71381.rs:13:82`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "C" fn(Args)>(&self) {`
`5`		`- \| ^^^^ const parameters must have a concrete type`
	`5`	+ \| ^^^^ the type must not depend on the parameter `Args`
`6`	`6`
`7`	`7`	`error[E0770]: the type of const parameters must not depend on other generic parameters`
`8`	`8`	`--> $DIR/issue-71381.rs:22:40`
`9`	`9`	`\|`
`10`	`10`	`LL \| const FN: unsafe extern "C" fn(Args),`
`11`		`- \| ^^^^ const parameters must have a concrete type`
	`11`	+ \| ^^^^ the type must not depend on the parameter `Args`
`12`	`12`
`13`	`13`	`error: using function pointers as const generic parameters is forbidden`
`14`	`14`	`--> $DIR/issue-71381.rs:13:61`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0770]: the type of const parameters must not depend on other generic para`
`2`	`2`	`--> $DIR/issue-71611.rs:4:31`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn func<A, const F: fn(inner: A)>(outer: A) {`
`5`		`- \| ^ const parameters must have a concrete type`
	`5`	+ \| ^ the type must not depend on the parameter `A`
`6`	`6`
`7`	`7`	`error: using function pointers as const generic parameters is forbidden`
`8`	`8`	`--> $DIR/issue-71611.rs:4:21`