Rollup merge of #64591 - jamesmunns:grammar-fix, r=jonas-schievink

Centril · web-flow · commit 7aa65bff2b25 · 2019-09-19T01:07:43.000+02:00
Fix a minor grammar nit, update UI tests

Minor fix, but I noticed it while debugging some code
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
@@ -134,7 +134,7 @@ impl IntercrateAmbiguityCause {
                     String::new()
                 };
                 format!(
-                    "upstream crates may add new impl of trait `{}`{} \
+                    "upstream crates may add a new impl of trait `{}`{} \
                      in future versions",
                     trait_desc, self_desc
                 )
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
@@ -25,7 +25,7 @@ LL |     fn baz(&self) {}
 LL |     fn baz(&self) {}
    |     ---------------- other definition for `baz`
    |
-   = note: upstream crates may add new impl of trait `std::marker::Copy` for type `std::vec::Vec<_>` in future versions
+   = note: upstream crates may add a new impl of trait `std::marker::Copy` for type `std::vec::Vec<_>` in future versions
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.old.stderr b/src/test/ui/coherence/coherence-overlap-upstream-inherent.old.stderr
@@ -7,7 +7,7 @@ LL | impl<T> A<T> where T: Remote { fn dummy(&self) { } }
 LL | impl A<i16> { fn dummy(&self) { } }
    |               ------------------- other definition for `dummy`
    |
-   = note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
+   = note: upstream crates may add a new impl of trait `coherence_lib::Remote` for type `i16` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.re.stderr b/src/test/ui/coherence/coherence-overlap-upstream-inherent.re.stderr
@@ -7,7 +7,7 @@ LL | impl<T> A<T> where T: Remote { fn dummy(&self) { } }
 LL | impl A<i16> { fn dummy(&self) { } }
    |               ------------------- other definition for `dummy`
    |
-   = note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
+   = note: upstream crates may add a new impl of trait `coherence_lib::Remote` for type `i16` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-overlap-upstream.old.stderr b/src/test/ui/coherence/coherence-overlap-upstream.old.stderr
@@ -6,7 +6,7 @@ LL | impl<T> Foo for T where T: Remote {}
 LL | impl Foo for i16 {}
    | ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
    |
-   = note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
+   = note: upstream crates may add a new impl of trait `coherence_lib::Remote` for type `i16` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-overlap-upstream.re.stderr b/src/test/ui/coherence/coherence-overlap-upstream.re.stderr
@@ -6,7 +6,7 @@ LL | impl<T> Foo for T where T: Remote {}
 LL | impl Foo for i16 {}
    | ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
    |
-   = note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
+   = note: upstream crates may add a new impl of trait `coherence_lib::Remote` for type `i16` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.old.stderr b/src/test/ui/coherence/coherence-projection-conflict-orphan.old.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl<A:Iterator> Foo<A::Item> for A { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
    |
-   = note: upstream crates may add new impl of trait `std::iter::Iterator` for type `i32` in future versions
+   = note: upstream crates may add a new impl of trait `std::iter::Iterator` for type `i32` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.re.stderr b/src/test/ui/coherence/coherence-projection-conflict-orphan.re.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl<A:Iterator> Foo<A::Item> for A { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
    |
-   = note: upstream crates may add new impl of trait `std::iter::Iterator` for type `i32` in future versions
+   = note: upstream crates may add a new impl of trait `std::iter::Iterator` for type `i32` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.old.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.old.stderr
@@ -7,7 +7,7 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
 LL | impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
    |
-   = note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
+   = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.re.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.re.stderr
@@ -7,7 +7,7 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
 LL | impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
    |
-   = note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
+   = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.old.stderr b/src/test/ui/coherence/coherence_copy_like_err_struct.old.stderr
@@ -7,7 +7,7 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
 LL | impl MyTrait for lib::MyStruct<MyType> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
    |
-   = note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
+   = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.re.stderr b/src/test/ui/coherence/coherence_copy_like_err_struct.re.stderr
@@ -7,7 +7,7 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
 LL | impl MyTrait for lib::MyStruct<MyType> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
    |
-   = note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
+   = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.old.stderr b/src/test/ui/coherence/coherence_copy_like_err_tuple.old.stderr
@@ -7,7 +7,7 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
 LL | impl MyTrait for (MyType,) { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
    |
-   = note: upstream crates may add new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
+   = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.re.stderr b/src/test/ui/coherence/coherence_copy_like_err_tuple.re.stderr
@@ -7,7 +7,7 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
 LL | impl MyTrait for (MyType,) { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
    |
-   = note: upstream crates may add new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
+   = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-48728.stderr b/src/test/ui/issues/issue-48728.stderr
@@ -7,7 +7,7 @@ LL | #[derive(Clone)]
 LL | impl<T: Clone + ?Sized> Clone for Node<[T]> {
    | ------------------------------------------- first implementation here
    |
-   = note: upstream crates may add new impl of trait `std::clone::Clone` for type `[_]` in future versions
+   = note: upstream crates may add a new impl of trait `std::clone::Clone` for type `[_]` in future versions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/specialization/issue-52050.stderr b/src/test/ui/specialization/issue-52050.stderr
@@ -11,7 +11,7 @@ LL |
 LL |   impl IntoPyDictPointer for ()
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()`
    |
-   = note: upstream crates may add new impl of trait `std::iter::Iterator` for type `()` in future versions
+   = note: upstream crates may add a new impl of trait `std::iter::Iterator` for type `()` in future versions
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ impl IntercrateAmbiguityCause {`
`134`	`134`	`String::new()`
`135`	`135`	`};`
`136`	`136`	`format!(`
`137`		- "upstream crates may add new impl of trait `{}`{} \
	`137`	+ "upstream crates may add a new impl of trait `{}`{} \
`138`	`138`	`in future versions",`
`139`	`139`	`trait_desc, self_desc`
`140`	`140`	`)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ LL \| fn baz(&self) {}`
`25`	`25`	`LL \| fn baz(&self) {}`
`26`	`26`	\| ---------------- other definition for `baz`
`27`	`27`	`\|`
`28`		- = note: upstream crates may add new impl of trait `std::marker::Copy` for type `std::vec::Vec<_>` in future versions
	`28`	+ = note: upstream crates may add a new impl of trait `std::marker::Copy` for type `std::vec::Vec<_>` in future versions
`29`	`29`
`30`	`30`	`error: aborting due to 3 previous errors`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| impl<T> A<T> where T: Remote { fn dummy(&self) { } }`
`7`	`7`	`LL \| impl A<i16> { fn dummy(&self) { } }`
`8`	`8`	\| ------------------- other definition for `dummy`
`9`	`9`	`\|`
`10`		- = note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
	`10`	+ = note: upstream crates may add a new impl of trait `coherence_lib::Remote` for type `i16` in future versions
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| impl<T> Foo for T where T: Remote {}`
`6`	`6`	`LL \| impl Foo for i16 {}`
`7`	`7`	\| ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
`8`	`8`	`\|`
`9`		- = note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
	`9`	+ = note: upstream crates may add a new impl of trait `coherence_lib::Remote` for type `i16` in future versions
`10`	`10`
`11`	`11`	`error: aborting due to previous error`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \|`
`7`	`7`	`LL \| impl<A:Iterator> Foo<A::Item> for A { }`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
`9`	`9`	`\|`
`10`		- = note: upstream crates may add new impl of trait `std::iter::Iterator` for type `i32` in future versions
	`10`	+ = note: upstream crates may add a new impl of trait `std::iter::Iterator` for type `i32` in future versions
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| impl<T: lib::MyCopy> MyTrait for T { }`
`7`	`7`	`LL \| impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
`9`	`9`	`\|`
`10`		- = note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
	`10`	+ = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| impl<T: lib::MyCopy> MyTrait for T { }`
`7`	`7`	`LL \| impl MyTrait for lib::MyStruct<MyType> { }`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
`9`	`9`	`\|`
`10`		- = note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
	`10`	+ = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| impl<T: lib::MyCopy> MyTrait for T { }`
`7`	`7`	`LL \| impl MyTrait for (MyType,) { }`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
`9`	`9`	`\|`
`10`		- = note: upstream crates may add new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
	`10`	+ = note: upstream crates may add a new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| #[derive(Clone)]`
`7`	`7`	`LL \| impl<T: Clone + ?Sized> Clone for Node<[T]> {`
`8`	`8`	`\| ------------------------------------------- first implementation here`
`9`	`9`	`\|`
`10`		- = note: upstream crates may add new impl of trait `std::clone::Clone` for type `[_]` in future versions
	`10`	+ = note: upstream crates may add a new impl of trait `std::clone::Clone` for type `[_]` in future versions
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ LL \|`
`11`	`11`	`LL \| impl IntoPyDictPointer for ()`
`12`	`12`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()`
`13`	`13`	`\|`
`14`		- = note: upstream crates may add new impl of trait `std::iter::Iterator` for type `()` in future versions
	`14`	+ = note: upstream crates may add a new impl of trait `std::iter::Iterator` for type `()` in future versions
`15`	`15`
`16`	`16`	`error: aborting due to previous error`
`17`	`17`