---

bors · bors · commit 5255f338067d · 2015-06-04T08:42:22.000Z
yaml --- r: 218943 b: refs/heads/snap-stage3 c: 0aeb9f6 h: refs/heads/master i: 218941: 069e5a3 218939: ebc60e3 218935: b70db08 218927: 94b4db6 218911: 6ffcb0c 218879: 7a0917d v: v3
diff --git a/[refs] b/[refs]
@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: fd3b6ca508ed99004a11291ef1d2c64104102a41
+refs/heads/snap-stage3: 0aeb9f6f08c353c71d962d5cc7a231e73040ca3c
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/snap-stage3/src/libcollections/linked_list.rs b/branches/snap-stage3/src/libcollections/linked_list.rs
@@ -106,16 +106,14 @@ impl<T> Rawlink<T> {
     /// Convert the `Rawlink` into an Option value
     fn resolve_immut<'a>(&self) -> Option<&'a T> {
         unsafe {
-            mem::transmute(self.p.as_ref())
+            self.p.as_ref()
         }
     }
 
     /// Convert the `Rawlink` into an Option value
     fn resolve<'a>(&mut self) -> Option<&'a mut T> {
-        if self.p.is_null() {
-            None
-        } else {
-            Some(unsafe { mem::transmute(self.p) })
+        unsafe {
+            self.p.as_mut()
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -106,16 +106,14 @@ impl<T> Rawlink<T> {`
`106`	`106`	/// Convert the `Rawlink` into an Option value
`107`	`107`	`fn resolve_immut<'a>(&self) -> Option<&'a T> {`
`108`	`108`	`unsafe {`
`109`		`- mem::transmute(self.p.as_ref())`
	`109`	`+ self.p.as_ref()`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	/// Convert the `Rawlink` into an Option value
`114`	`114`	`fn resolve<'a>(&mut self) -> Option<&'a mut T> {`
`115`		`- if self.p.is_null() {`
`116`		`- None`
`117`		`- } else {`
`118`		`- Some(unsafe { mem::transmute(self.p) })`
	`115`	`+ unsafe {`
	`116`	`+ self.p.as_mut()`
`119`	`117`	`}`
`120`	`118`	`}`
`121`	`119`