mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #60037 - eddyb:actually-its-param, r=estebank

Browse Source 
Resolve inconsistency in error messages between "parameter" and "variable".

The inconsistency was introduced in 104fe1c4db (#33619), when a label saying `type variable` was added to an error with a message talking about `type parameters`.
Given that `parameter` is far more prevalent when referring to generics in the context of Rust, IMO it should be that in both the message and the label.

r? @nikomatsakis or @estebank
This commit is contained in:
Mazdak Farrokhzad 2019-04-18 00:23:40 +02:00 committed by GitHub
commit 42b3cf107d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_resolve/lib.rs
View File

@ -234,12 +234,12 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver<'_>,
},
Def::TyParam(def_id) => {
if let Some(span) = resolver.definitions.opt_span(def_id) {
err.span_label(span, "type variable from outer function");
err.span_label(span, "type parameter from outer function");
}
}
Def::ConstParam(def_id) => {
if let Some(span) = resolver.definitions.opt_span(def_id) {
err.span_label(span, "const variable from outer function");
err.span_label(span, "const parameter from outer function");
}
}
_ => {

2
src/test/ui/bad/bad-type-env-capture.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/bad-type-env-capture.rs:2:15
|
LL | fn foo<T>() {
| - type variable from outer function
| - type parameter from outer function
LL | fn bar(b: T) { }
| --- ^ use of generic parameter from outer function
| |

2
src/test/ui/const-generics/const-param-from-outer-fn.stderr
View File

@ -8,7 +8,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/const-param-from-outer-fn.rs:6:9
|
LL | fn foo<const X: u32>() {
| - const variable from outer function
| - const parameter from outer function
LL | fn bar() -> u32 {
| --- try adding a local generic parameter in this method instead
LL | X

4
src/test/ui/error-codes/E0401.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/E0401.rs:4:39
|
LL | fn foo<T>(x: T) {
| - type variable from outer function
| - type parameter from outer function
LL | fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
| --------------------------- ^ use of generic parameter from outer function
| |
@ -12,7 +12,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/E0401.rs:9:16
|
LL | fn foo<T>(x: T) {
| - type variable from outer function
| - type parameter from outer function
...
LL | fn baz<U,
| --- try adding a local generic parameter in this method instead

2
src/test/ui/inner-static-type-parameter.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/inner-static-type-parameter.rs:6:19
|
LL | fn foo<T>() {
| --- - type variable from outer function
| --- - type parameter from outer function
| |
| try adding a local generic parameter in this method instead
LL | static a: Bar<T> = Bar::What;

4
src/test/ui/issues/issue-3021-c.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/issue-3021-c.rs:4:24
|
LL | fn siphash<T>() {
| - type variable from outer function
| - type parameter from outer function
...
LL | fn g(&self, x: T) -> T;
| - ^ use of generic parameter from outer function
@ -13,7 +13,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/issue-3021-c.rs:4:30
|
LL | fn siphash<T>() {
| - type variable from outer function
| - type parameter from outer function
...
LL | fn g(&self, x: T) -> T;
| - ^ use of generic parameter from outer function

2
src/test/ui/issues/issue-3214.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/issue-3214.rs:3:12
|
LL | fn foo<T>() {
| --- - type variable from outer function
| --- - type parameter from outer function
| |
| try adding a local generic parameter in this method instead
LL | struct Foo {

2
src/test/ui/issues/issue-5997-enum.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/issue-5997-enum.rs:2:16
|
LL | fn f<Z>() -> bool {
| - - type variable from outer function
| - - type parameter from outer function
| |
| try adding a local generic parameter in this method instead
LL | enum E { V(Z) }

2
src/test/ui/issues/issue-5997-struct.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/issue-5997-struct.rs:2:14
|
LL | fn f<T>() -> bool {
| - - type variable from outer function
| - - type parameter from outer function
| |
| try adding a local generic parameter in this method instead
LL | struct S(T);

4
src/test/ui/nested-ty-params.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/nested-ty-params.rs:3:16
|
LL | fn hd<U>(v: Vec<U> ) -> U {
| - type variable from outer function
| - type parameter from outer function
LL | fn hd1(w: [U]) -> U { return w[0]; }
| --- ^ use of generic parameter from outer function
| |
@ -12,7 +12,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/nested-ty-params.rs:3:23
|
LL | fn hd<U>(v: Vec<U> ) -> U {
| - type variable from outer function
| - type parameter from outer function
LL | fn hd1(w: [U]) -> U { return w[0]; }
| --- ^ use of generic parameter from outer function
| |

8
src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/resolve-type-param-in-item-in-trait.rs:8:22
|
LL | trait TraitA<A> {
| - type variable from outer function
| - type parameter from outer function
LL | fn outer(&self) {
| ----- try adding a local generic parameter in this method instead
LL | enum Foo<B> {
@ -13,7 +13,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/resolve-type-param-in-item-in-trait.rs:16:23
|
LL | trait TraitB<A> {
| - type variable from outer function
| - type parameter from outer function
LL | fn outer(&self) {
| ----- try adding a local generic parameter in this method instead
LL | struct Foo<B>(A);
@ -23,7 +23,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/resolve-type-param-in-item-in-trait.rs:23:28
|
LL | trait TraitC<A> {
| - type variable from outer function
| - type parameter from outer function
LL | fn outer(&self) {
| ----- try adding a local generic parameter in this method instead
LL | struct Foo<B> { a: A }
@ -33,7 +33,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/resolve-type-param-in-item-in-trait.rs:30:22
|
LL | trait TraitD<A> {
| - type variable from outer function
| - type parameter from outer function
LL | fn outer(&self) {
LL | fn foo<B>(a: A) { }
| ------ ^ use of generic parameter from outer function

4
src/test/ui/type/type-arg-out-of-scope.stderr
View File

@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/type-arg-out-of-scope.rs:3:25
|
LL | fn foo<T>(x: T) {
| - type variable from outer function
| - type parameter from outer function
LL | fn bar(f: Box<FnMut(T) -> T>) { }
| --- ^ use of generic parameter from outer function
| |
@ -12,7 +12,7 @@ error[E0401]: can't use generic parameters from outer function
--> $DIR/type-arg-out-of-scope.rs:3:31
|
LL | fn foo<T>(x: T) {
| - type variable from outer function
| - type parameter from outer function
LL | fn bar(f: Box<FnMut(T) -> T>) { }
| --- ^ use of generic parameter from outer function
| |