OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Fix a minor grammar nit, update UI tests

Minor fix, but I noticed it while debugging some code
This commit is contained in:
Mazdak Farrokhzad 2019-09-19 04:53:12 +02:00 committed by GitHub
commit cad2d5840b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/traits/select.rs
View File

@ -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
)

2
src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
View File

@ -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

2
src/test/ui/coherence/coherence-overlap-upstream-inherent.old.stderr
View File

@ -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

2
src/test/ui/coherence/coherence-overlap-upstream-inherent.re.stderr
View File

@ -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

2
src/test/ui/coherence/coherence-overlap-upstream.old.stderr
View File

@ -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

2
src/test/ui/coherence/coherence-overlap-upstream.re.stderr
View File

@ -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

2
src/test/ui/coherence/coherence-projection-conflict-orphan.old.stderr
View File

@ -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

2
src/test/ui/coherence/coherence-projection-conflict-orphan.re.stderr
View File

@ -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

2
src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.old.stderr
View File

@ -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

2
src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.re.stderr
View File

@ -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

2
src/test/ui/coherence/coherence_copy_like_err_struct.old.stderr
View File

@ -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

2
src/test/ui/coherence/coherence_copy_like_err_struct.re.stderr
View File

@ -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

2
src/test/ui/coherence/coherence_copy_like_err_tuple.old.stderr
View File

@ -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

2
src/test/ui/coherence/coherence_copy_like_err_tuple.re.stderr
View File

@ -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

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

@ -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

2
src/test/ui/specialization/issue-52050.stderr
View File

@ -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