diff options
| author | Oleg Nosov <olegnosov1@gmail.com> | 2019-11-05 23:34:54 +0300 |
|---|---|---|
| committer | Oleg Nosov <olegnosov1@gmail.com> | 2019-11-05 23:36:54 +0300 |
| commit | 45f281d46166fb90c7e9403ad814bebb67aa926d (patch) | |
| tree | 235326eff9ee315c9b7cba7dcc5fb51db140b75a /src/liballoc | |
| parent | 3a54ab78efc66c17a6d2bb57463f5dac4696c7ed (diff) | |
| download | rust-45f281d46166fb90c7e9403ad814bebb67aa926d.tar.gz rust-45f281d46166fb90c7e9403ad814bebb67aa926d.zip | |
Reverted PhantomData in LinkedList, fixed PhantomData markers in Rc and Arc
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/linked_list.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/sync.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs index da06203a2cb..8d73f352fd4 100644 --- a/src/liballoc/collections/linked_list.rs +++ b/src/liballoc/collections/linked_list.rs @@ -39,7 +39,7 @@ pub struct LinkedList<T> { head: Option<NonNull<Node<T>>>, tail: Option<NonNull<Node<T>>>, len: usize, - marker: PhantomData<T>, + marker: PhantomData<Box<Node<T>>>, } struct Node<T> { @@ -60,7 +60,7 @@ pub struct Iter<'a, T: 'a> { head: Option<NonNull<Node<T>>>, tail: Option<NonNull<Node<T>>>, len: usize, - marker: PhantomData<&'a T>, + marker: PhantomData<&'a Node<T>>, } #[stable(feature = "collection_debug", since = "1.17.0")] diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index f1c4c32e116..a11f9e8c145 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -280,7 +280,7 @@ struct RcBox<T: ?Sized> { #[stable(feature = "rust1", since = "1.0.0")] pub struct Rc<T: ?Sized> { ptr: NonNull<RcBox<T>>, - phantom: PhantomData<T>, + phantom: PhantomData<RcBox<T>>, } #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index 80d6c6e0d43..4b10f089c29 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -195,7 +195,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize; #[stable(feature = "rust1", since = "1.0.0")] pub struct Arc<T: ?Sized> { ptr: NonNull<ArcInner<T>>, - phantom: PhantomData<T>, + phantom: PhantomData<ArcInner<T>>, } #[stable(feature = "rust1", since = "1.0.0")] |