Rollup merge of rust-lang#65057 - mathstuf:fix-warning-typo, r=Centril

tmandry · web-flow · commit 5264e6917de9 · 2019-10-03T16:10:16.000-07:00
typo: fix typo in E0392 See rust-lang#64931. --- Cc: @Centril @estebank
diff --git a/src/librustc_typeck/check/wfcheck.rs b/src/librustc_typeck/check/wfcheck.rs
@@ -1013,12 +1013,12 @@ fn report_bivariance(tcx: TyCtxt<'_>, span: Span, param_name: ast::Name) {
     // Help is available only in presence of lang items.
     let msg = if let Some(def_id) = suggested_marker_id {
         format!(
-            "consider removing `{}`, refering to it in a field, or using a marker such as `{}`",
+            "consider removing `{}`, referring to it in a field, or using a marker such as `{}`",
             param_name,
             tcx.def_path_str(def_id),
         )
     } else {
-        format!( "consider removing `{}` or refering to it in a field", param_name)
+        format!( "consider removing `{}` or referring to it in a field", param_name)
     };
     err.help(&msg);
     err.emit();
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
@@ -18,7 +18,7 @@ error[E0392]: parameter `T` is never used
 LL | pub struct Dependent<T, const X: T>([(); X]);
    |                      ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr
@@ -4,7 +4,7 @@ error[E0392]: parameter `T` is never used
 LL | enum Foo<T> { Bar }
    |          ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/inner-static-type-parameter.stderr b/src/test/ui/inner-static-type-parameter.stderr
@@ -14,7 +14,7 @@ error[E0392]: parameter `T` is never used
 LL | enum Bar<T> { What }
    |          ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-17904-2.stderr b/src/test/ui/issues/issue-17904-2.stderr
@@ -4,7 +4,7 @@ error[E0392]: parameter `T` is never used
 LL | struct Foo<T> where T: Copy;
    |            ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-20413.stderr b/src/test/ui/issues/issue-20413.stderr
@@ -4,7 +4,7 @@ error[E0392]: parameter `T` is never used
 LL | struct NoData<T>;
    |               ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0275]: overflow evaluating the requirement `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: Foo`
   --> $DIR/issue-20413.rs:8:1
diff --git a/src/test/ui/issues/issue-36299.stderr b/src/test/ui/issues/issue-36299.stderr
@@ -4,15 +4,15 @@ error[E0392]: parameter `'a` is never used
 LL | struct Foo<'a, A> {}
    |            ^^ unused parameter
    |
-   = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `A` is never used
   --> $DIR/issue-36299.rs:1:16
    |
 LL | struct Foo<'a, A> {}
    |                ^ unused parameter
    |
-   = help: consider removing `A`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `A`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-36638.stderr b/src/test/ui/issues/issue-36638.stderr
@@ -16,7 +16,7 @@ error[E0392]: parameter `Self` is never used
 LL | struct Foo<Self>(Self);
    |            ^^^^ unused parameter
    |
-   = help: consider removing `Self`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `Self`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-37534.stderr b/src/test/ui/issues/issue-37534.stderr
@@ -20,7 +20,7 @@ error[E0392]: parameter `T` is never used
 LL | struct Foo<T: ?Hash> { }
    |            ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr
@@ -27,7 +27,7 @@ error[E0392]: parameter `'c` is never used
 LL | struct Foo<'a,'b,'c> {
    |                  ^^ unused parameter
    |
-   = help: consider removing `'c`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'c`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/self/self_type_keyword.stderr b/src/test/ui/self/self_type_keyword.stderr
@@ -76,7 +76,7 @@ error[E0392]: parameter `'Self` is never used
 LL | struct Bar<'Self>;
    |            ^^^^^ unused parameter
    |
-   = help: consider removing `'Self`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'Self`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 12 previous errors
 
diff --git a/src/test/ui/variance/variance-regions-unused-direct.stderr b/src/test/ui/variance/variance-regions-unused-direct.stderr
@@ -4,15 +4,15 @@ error[E0392]: parameter `'a` is never used
 LL | struct Bivariant<'a>;
    |                  ^^ unused parameter
    |
-   = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `'d` is never used
   --> $DIR/variance-regions-unused-direct.rs:7:19
    |
 LL | struct Struct<'a, 'd> {
    |                   ^^ unused parameter
    |
-   = help: consider removing `'d`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'d`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/variance/variance-regions-unused-indirect.stderr b/src/test/ui/variance/variance-regions-unused-indirect.stderr
@@ -4,15 +4,15 @@ error[E0392]: parameter `'a` is never used
 LL | enum Foo<'a> {
    |          ^^ unused parameter
    |
-   = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `'a` is never used
   --> $DIR/variance-regions-unused-indirect.rs:7:10
    |
 LL | enum Bar<'a> {
    |          ^^ unused parameter
    |
-   = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/variance/variance-unused-region-param.stderr b/src/test/ui/variance/variance-unused-region-param.stderr
@@ -4,15 +4,15 @@ error[E0392]: parameter `'a` is never used
 LL | struct SomeStruct<'a> { x: u32 }
    |                   ^^ unused parameter
    |
-   = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `'a` is never used
   --> $DIR/variance-unused-region-param.rs:4:15
    |
 LL | enum SomeEnum<'a> { Nothing }
    |               ^^ unused parameter
    |
-   = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/variance/variance-unused-type-param.stderr b/src/test/ui/variance/variance-unused-type-param.stderr
@@ -4,23 +4,23 @@ error[E0392]: parameter `A` is never used
 LL | struct SomeStruct<A> { x: u32 }
    |                   ^ unused parameter
    |
-   = help: consider removing `A`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `A`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `A` is never used
   --> $DIR/variance-unused-type-param.rs:9:15
    |
 LL | enum SomeEnum<A> { Nothing }
    |               ^ unused parameter
    |
-   = help: consider removing `A`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `A`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `T` is never used
   --> $DIR/variance-unused-type-param.rs:13:15
    |
 LL | enum ListCell<T> {
    |               ^ unused parameter
    |
-   = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error: aborting due to 3 previous errors
 

Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ error[E0392]: parameter `T` is never used
`18`	`18`	`LL \| pub struct Dependent<T, const X: T>([(); X]);`
`19`	`19`	`\| ^ unused parameter`
`20`	`20`	`\|`
`21`		- = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`21`	+ = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`22`	`22`
`23`	`23`	`error: aborting due to 2 previous errors`
`24`	`24`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0392]: parameter `T` is never used
`4`	`4`	`LL \| enum Foo<T> { Bar }`
`5`	`5`	`\| ^ unused parameter`
`6`	`6`	`\|`
`7`		- = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`7`	+ = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ error[E0392]: parameter `T` is never used
`14`	`14`	`LL \| enum Bar<T> { What }`
`15`	`15`	`\| ^ unused parameter`
`16`	`16`	`\|`
`17`		- = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`17`	+ = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`18`	`18`
`19`	`19`	`error: aborting due to 2 previous errors`
`20`	`20`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0392]: parameter `T` is never used
`4`	`4`	`LL \| struct Foo<T> where T: Copy;`
`5`	`5`	`\| ^ unused parameter`
`6`	`6`	`\|`
`7`		- = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`7`	+ = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0392]: parameter `T` is never used
`4`	`4`	`LL \| struct NoData<T>;`
`5`	`5`	`\| ^ unused parameter`
`6`	`6`	`\|`
`7`		- = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`7`	+ = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`8`	`8`
`9`	`9`	error[E0275]: overflow evaluating the requirement `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: Foo`
`10`	`10`	`--> $DIR/issue-20413.rs:8:1`
Original file line number	Diff line number	Diff line change
@@ -4,15 +4,15 @@ error[E0392]: parameter `'a` is never used
`4`	`4`	`LL \| struct Foo<'a, A> {}`
`5`	`5`	`\| ^^ unused parameter`
`6`	`6`	`\|`
`7`		- = help: consider removing `'a`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`7`	+ = help: consider removing `'a`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`8`	`8`
`9`	`9`	error[E0392]: parameter `A` is never used
`10`	`10`	`--> $DIR/issue-36299.rs:1:16`
`11`	`11`	`\|`
`12`	`12`	`LL \| struct Foo<'a, A> {}`
`13`	`13`	`\| ^ unused parameter`
`14`	`14`	`\|`
`15`		- = help: consider removing `A`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`15`	+ = help: consider removing `A`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`16`	`16`
`17`	`17`	`error: aborting due to 2 previous errors`
`18`	`18`
Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ error[E0392]: parameter `Self` is never used
`16`	`16`	`LL \| struct Foo<Self>(Self);`
`17`	`17`	`\| ^^^^ unused parameter`
`18`	`18`	`\|`
`19`		- = help: consider removing `Self`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`19`	+ = help: consider removing `Self`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`20`	`20`
`21`	`21`	`error: aborting due to 3 previous errors`
`22`	`22`
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ error[E0392]: parameter `T` is never used
`20`	`20`	`LL \| struct Foo<T: ?Hash> { }`
`21`	`21`	`\| ^ unused parameter`
`22`	`22`	`\|`
`23`		- = help: consider removing `T`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`23`	+ = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`24`	`24`
`25`	`25`	`error: aborting due to 2 previous errors`
`26`	`26`
Original file line number	Diff line number	Diff line change
@@ -27,7 +27,7 @@ error[E0392]: parameter `'c` is never used
`27`	`27`	`LL \| struct Foo<'a,'b,'c> {`
`28`	`28`	`\| ^^ unused parameter`
`29`	`29`	`\|`
`30`		- = help: consider removing `'c`, refering to it in a field, or using a marker such as `std::marker::PhantomData`
	`30`	+ = help: consider removing `'c`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
`31`	`31`
`32`	`32`	`error: aborting due to 3 previous errors`
`33`	`33`