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

Centril · web-flow · commit 42b3cf107d83 · 2019-04-18T00:23:40.000+02:00
Resolve inconsistency in error messages between "parameter" and "variable". The inconsistency was introduced in 104fe1c (#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
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
@@ -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");
                     }
                 }
                 _ => {
diff --git a/src/test/ui/bad/bad-type-env-capture.stderr b/src/test/ui/bad/bad-type-env-capture.stderr
@@ -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
    |        |
diff --git a/src/test/ui/const-generics/const-param-from-outer-fn.stderr b/src/test/ui/const-generics/const-param-from-outer-fn.stderr
@@ -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
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
@@ -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
diff --git a/src/test/ui/inner-static-type-parameter.stderr b/src/test/ui/inner-static-type-parameter.stderr
@@ -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;
diff --git a/src/test/ui/issues/issue-3021-c.stderr b/src/test/ui/issues/issue-3021-c.stderr
@@ -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
diff --git a/src/test/ui/issues/issue-3214.stderr b/src/test/ui/issues/issue-3214.stderr
@@ -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 {
diff --git a/src/test/ui/issues/issue-5997-enum.stderr b/src/test/ui/issues/issue-5997-enum.stderr
@@ -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) }
diff --git a/src/test/ui/issues/issue-5997-struct.stderr b/src/test/ui/issues/issue-5997-struct.stderr
@@ -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);
diff --git a/src/test/ui/nested-ty-params.stderr b/src/test/ui/nested-ty-params.stderr
@@ -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
    |        |
diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr
@@ -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
diff --git a/src/test/ui/type/type-arg-out-of-scope.stderr b/src/test/ui/type/type-arg-out-of-scope.stderr
@@ -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
    |        |

Original file line number	Diff line number	Diff line change
`@@ -234,12 +234,12 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver<'_>,`
`234`	`234`	`},`
`235`	`235`	`Def::TyParam(def_id) => {`
`236`	`236`	`if let Some(span) = resolver.definitions.opt_span(def_id) {`
`237`		`- err.span_label(span, "type variable from outer function");`
	`237`	`+ err.span_label(span, "type parameter from outer function");`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`Def::ConstParam(def_id) => {`
`241`	`241`	`if let Some(span) = resolver.definitions.opt_span(def_id) {`
`242`		`- err.span_label(span, "const variable from outer function");`
	`242`	`+ err.span_label(span, "const parameter from outer function");`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`_ => {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function`
`2`	`2`	`--> $DIR/bad-type-env-capture.rs:2:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn foo<T>() {`
`5`		`- \| - type variable from outer function`
	`5`	`+ \| - type parameter from outer function`
`6`	`6`	`LL \| fn bar(b: T) { }`
`7`	`7`	`\| --- ^ use of generic parameter from outer function`
`8`	`8`	`\| \|`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ error[E0401]: can't use generic parameters from outer function`
`8`	`8`	`--> $DIR/const-param-from-outer-fn.rs:6:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| fn foo<const X: u32>() {`
`11`		`- \| - const variable from outer function`
	`11`	`+ \| - const parameter from outer function`
`12`	`12`	`LL \| fn bar() -> u32 {`
`13`	`13`	`\| --- try adding a local generic parameter in this method instead`
`14`	`14`	`LL \| X`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function`
`2`	`2`	`--> $DIR/inner-static-type-parameter.rs:6:19`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn foo<T>() {`
`5`		`- \| --- - type variable from outer function`
	`5`	`+ \| --- - type parameter from outer function`
`6`	`6`	`\| \|`
`7`	`7`	`\| try adding a local generic parameter in this method instead`
`8`	`8`	`LL \| static a: Bar<T> = Bar::What;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function`
`2`	`2`	`--> $DIR/issue-3214.rs:3:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn foo<T>() {`
`5`		`- \| --- - type variable from outer function`
	`5`	`+ \| --- - type parameter from outer function`
`6`	`6`	`\| \|`
`7`	`7`	`\| try adding a local generic parameter in this method instead`
`8`	`8`	`LL \| struct Foo {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function`
`2`	`2`	`--> $DIR/issue-5997-enum.rs:2:16`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn f<Z>() -> bool {`
`5`		`- \| - - type variable from outer function`
	`5`	`+ \| - - type parameter from outer function`
`6`	`6`	`\| \|`
`7`	`7`	`\| try adding a local generic parameter in this method instead`
`8`	`8`	`LL \| enum E { V(Z) }`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0401]: can't use generic parameters from outer function`
`2`	`2`	`--> $DIR/issue-5997-struct.rs:2:14`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn f<T>() -> bool {`
`5`		`- \| - - type variable from outer function`
	`5`	`+ \| - - type parameter from outer function`
`6`	`6`	`\| \|`
`7`	`7`	`\| try adding a local generic parameter in this method instead`
`8`	`8`	`LL \| struct S(T);`