diff options
| author | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2019-09-24 21:16:09 +0300 |
|---|---|---|
| committer | Ariel Ben-Yehuda <ariel.byd@gmail.com> | 2019-09-25 23:18:31 +0300 |
| commit | e70724c23bd2bd5cfbbac784d103f2a61a40284f (patch) | |
| tree | 7e2aa3c8d980579ab3fbf2f9513115d9f14c06cb /src | |
| parent | 99dc545552c40212b9d062512cd391af076b51c9 (diff) | |
| download | rust-e70724c23bd2bd5cfbbac784d103f2a61a40284f.tar.gz rust-e70724c23bd2bd5cfbbac784d103f2a61a40284f.zip | |
address rebase damage
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/convert.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index f639309db87..3cd2337ee59 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -560,7 +560,7 @@ impl<T> From<T> for T { /// /// [#64715]: https://github.com/rust-lang/rust/issues/64715 #[stable(feature = "convert_infallible", since = "1.34.0")] -#[cfg(not(boostrap_stdarch_ignore_this))] +#[cfg(not(bootstrap))] #[rustc_reservation_impl="permitting this impl would forbid us from adding \ `impl<T> From<!> for T` later; see rust-lang/rust#64715 for details"] impl<T> From<!> for T { diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr b/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr index 8a86f53086d..0cd56b978f1 100644 --- a/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr +++ b/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `(): MyTrait` is not satisfied - --> $DIR/reservation-impl-no-use.rs:12:5 + --> $DIR/reservation-impl-no-use.rs:12:26 | LL | trait MyTrait { fn foo(&self); } | -------------- required by `MyTrait::foo` ... LL | <() as MyTrait>::foo(&()); - | ^^^^^^^^^^^^^^^^^^^^ the trait `MyTrait` is not implemented for `()` + | ^^^ the trait `MyTrait` is not implemented for `()` | = help: the following implementations were found: <() as MyTrait> |