---

nikomatsakis · nikomatsakis · commit 405db5c44453 · 2015-02-18T10:25:12.000-05:00
yaml --- r: 184158 b: refs/heads/beta c: 2bcf3a4 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 8dbdcdbfb3d09c6d521b275e71370117850c89e2
+refs/heads/beta: 2bcf3a4cd15f706dcb07b1835babeea15b8aa8c1
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: c65fb1a81e5dc58cf171cc47f65de9e6e2119247
diff --git a/branches/beta/src/libarena/lib.rs b/branches/beta/src/libarena/lib.rs
@@ -96,7 +96,7 @@ pub struct Arena<'longer_than_self> {
     head: RefCell<Chunk>,
     copy_head: RefCell<Chunk>,
     chunks: RefCell<Vec<Chunk>>,
-    _invariant: marker::InvariantLifetime<'longer_than_self>,
+    _marker: marker::PhantomData<*mut &'longer_than_self()>,
 }
 
 impl<'a> Arena<'a> {
@@ -111,7 +111,7 @@ impl<'a> Arena<'a> {
             head: RefCell::new(chunk(initial_size, false)),
             copy_head: RefCell::new(chunk(initial_size, true)),
             chunks: RefCell::new(Vec::new()),
-            _invariant: marker::InvariantLifetime,
+            _marker: marker::PhantomData,
         }
     }
 }
@@ -361,6 +361,8 @@ pub struct TypedArena<T> {
 }
 
 struct TypedArenaChunk<T> {
+    marker: marker::PhantomData<T>,
+
     /// Pointer to the next arena segment.
     next: *mut TypedArenaChunk<T>,
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ pub struct Arena<'longer_than_self> {`
`96`	`96`	`head: RefCell<Chunk>,`
`97`	`97`	`copy_head: RefCell<Chunk>,`
`98`	`98`	`chunks: RefCell<Vec<Chunk>>,`
`99`		`- _invariant: marker::InvariantLifetime<'longer_than_self>,`
	`99`	`+ _marker: marker::PhantomData<*mut &'longer_than_self()>,`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`impl<'a> Arena<'a> {`
`@@ -111,7 +111,7 @@ impl<'a> Arena<'a> {`
`111`	`111`	`head: RefCell::new(chunk(initial_size, false)),`
`112`	`112`	`copy_head: RefCell::new(chunk(initial_size, true)),`
`113`	`113`	`chunks: RefCell::new(Vec::new()),`
`114`		`- _invariant: marker::InvariantLifetime,`
	`114`	`+ _marker: marker::PhantomData,`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`
`@@ -361,6 +361,8 @@ pub struct TypedArena<T> {`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`struct TypedArenaChunk<T> {`
	`364`	`+ marker: marker::PhantomData<T>,`
	`365`	`+`
`364`	`366`	`/// Pointer to the next arena segment.`
`365`	`367`	`next: *mut TypedArenaChunk<T>,`
`366`	`368`