---

bors · bors · commit 78058ff02178 · 2015-06-04T08:42:22.000Z
yaml --- r: 212197 b: refs/heads/tmp c: 0aeb9f6 h: refs/heads/master i: 212195: de22887 v: v3
diff --git a/[refs] b/[refs]
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 62e70d35be3fe532c26a400b499c58a18f18dd3a
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: fd3b6ca508ed99004a11291ef1d2c64104102a41
+refs/heads/tmp: 0aeb9f6f08c353c71d962d5cc7a231e73040ca3c
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: b77d60adb019bb5de05e884a99f3290ec4694137
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412
diff --git a/branches/tmp/src/libcollections/linked_list.rs b/branches/tmp/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`