Skip to content

Fix a minor grammar nit, update UI tests #64591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2019
Merged

Fix a minor grammar nit, update UI tests #64591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f233a4c
Fix a minor grammar nit, update UI tests
Sep 18, 2019
333230f
Restore whitespace
Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/traits/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence-overlap-upstream-inherent.old.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence-overlap-upstream-inherent.re.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence-overlap-upstream.old.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence-overlap-upstream.re.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence-projection-conflict-orphan.old.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence-projection-conflict-orphan.re.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.old.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.re.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence_copy_like_err_struct.old.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence_copy_like_err_struct.re.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence_copy_like_err_tuple.old.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/coherence/coherence_copy_like_err_tuple.re.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-48728.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/specialization/issue-52050.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down