---

bors · bors · commit 60fa7303c3c2 · 2015-06-04T08:42:22.000Z
yaml --- r: 214987 b: refs/heads/beta c: 0aeb9f6 h: refs/heads/master i: 214985: c9bda84 214983: 022eeaa v: v3
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: fd3b6ca508ed99004a11291ef1d2c64104102a41
+refs/heads/beta: 0aeb9f6f08c353c71d962d5cc7a231e73040ca3c
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/libcollections/linked_list.rs b/branches/beta/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`