diff options
| author | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2019-01-15 00:26:50 +0200 |
|---|---|---|
| committer | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2019-01-15 00:27:00 +0200 |
| commit | d38a59f8b5ad8ddbed5294bb4755618d7c2802aa (patch) | |
| tree | 3cd7d67ddea1e015e2edacffc85983f7ea6c8352 | |
| parent | de6566ce391478c5c483fed98eaf6e3c37f4dab9 (diff) | |
| download | rust-d38a59f8b5ad8ddbed5294bb4755618d7c2802aa.tar.gz rust-d38a59f8b5ad8ddbed5294bb4755618d7c2802aa.zip | |
fix test output changing in rebase
| -rw-r--r-- | src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr b/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr index 6e146760db5..c8a146cdd44 100644 --- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr +++ b/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr @@ -16,7 +16,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar LL | impl !Send for dyn Marker2 {} //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate | - = note: the impl does not reference any types defined in this crate + = note: the impl does not reference only types defined in this crate = note: define and implement a trait or new type instead error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `(dyn Object + 'static)` diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr b/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr index 4a8347613eb..78ca2f5279d 100644 --- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr +++ b/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr @@ -16,7 +16,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar LL | unsafe impl Send for dyn Marker2 {} //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate | - = note: the impl does not reference any types defined in this crate + = note: the impl does not reference only types defined in this crate = note: define and implement a trait or new type instead error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `(dyn Object + 'static)` |