about summary refs log tree commit diff
path: root/src/liballoc/collections
diff options
context:
space:
mode:
authorOleg Nosov <olegnosov1@gmail.com>2019-11-05 23:34:54 +0300
committerOleg Nosov <olegnosov1@gmail.com>2019-11-05 23:36:54 +0300
commit45f281d46166fb90c7e9403ad814bebb67aa926d (patch)
tree235326eff9ee315c9b7cba7dcc5fb51db140b75a /src/liballoc/collections
parent3a54ab78efc66c17a6d2bb57463f5dac4696c7ed (diff)
downloadrust-45f281d46166fb90c7e9403ad814bebb67aa926d.tar.gz
rust-45f281d46166fb90c7e9403ad814bebb67aa926d.zip
Reverted PhantomData in LinkedList, fixed PhantomData markers in Rc and Arc
Diffstat (limited to 'src/liballoc/collections')
-rw-r--r--src/liballoc/collections/linked_list.rs4
1 files changed, 2 insertions, 2 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")]