Skip to content
Permalink
Browse files

address rebase damage

  • Loading branch information...
arielb1 committed Sep 24, 2019
1 parent 99dc545 commit e70724c23bd2bd5cfbbac784d103f2a61a40284f
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/libcore/convert.rs
  2. +2 −2 src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr
@@ -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 {
@@ -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>

0 comments on commit e70724c

Please sign in to comment.
You can’t perform that action at this time.