Skip to content

Commit 83669ec

Browse files
committed
Rollup merge of rust-lang#49621 - Nemo157:impl-unpin-for-pin, r=withoutboats
2 parents 71bf15c + a29d4d9 commit 83669ec

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/liballoc/boxed.rs

+3
Original file line numberDiff line numberDiff line change
@@ -845,3 +845,6 @@ impl<T: ?Sized> fmt::Pointer for PinBox<T> {
845845

846846
#[unstable(feature = "pin", issue = "49150")]
847847
impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<PinBox<U>> for PinBox<T> {}
848+
849+
#[unstable(feature = "pin", issue = "49150")]
850+
unsafe impl<T: ?Sized> Unpin for PinBox<T> {}

src/libcore/mem.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1213,3 +1213,6 @@ impl<'a, T: ?Sized> fmt::Pointer for Pin<'a, T> {
12131213

12141214
#[unstable(feature = "pin", issue = "49150")]
12151215
impl<'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Pin<'a, U>> for Pin<'a, T> {}
1216+
1217+
#[unstable(feature = "pin", issue = "49150")]
1218+
unsafe impl<'a, T: ?Sized> Unpin for Pin<'a, T> {}

0 commit comments

Comments
 (0)