address rebase damage · rust-lang/rust@e70724c (original) (raw)

File tree

2 files changed

lines changed

2 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -560,7 +560,7 @@ impl From for T {
560 560 ///
561 561 /// [#64715]: https://github.com/rust-lang/rust/issues/64715
562 562 #[stable(feature = "convert_infallible", since = "1.34.0")]
563 -#[cfg(not(boostrap_stdarch_ignore_this))]
563 +#[cfg(not(bootstrap))]
564 564 #[rustc_reservation_impl="permitting this impl would forbid us from adding \
565 565 `impl From<!> for T` later; see rust-lang/rust#64715 for details"]
566 566 impl<T> From<!> for T {
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
1 1 error[E0277]: the trait bound `(): MyTrait` is not satisfied
2 - --> $DIR/reservation-impl-no-use.rs:12:5
2 + --> $DIR/reservation-impl-no-use.rs:12:26
3 3 |
4 4 LL | trait MyTrait { fn foo(&self); }
5 5 | -------------- required by `MyTrait::foo`
6 6 ...
7 7 LL | <() as MyTrait>::foo(&());
8 - | ^^^^^^^^^^^^^^^^^^^^ the trait `MyTrait` is not implemented for `()`
8 + | ^^^ the trait `MyTrait` is not implemented for `()`
9 9 |
10 10 = help: the following implementations were found:
11 11 <() as MyTrait>