---

bors · bors · commit 928e56db4c8a · 2015-06-04T08:42:22.000Z
yaml --- r: 211899 b: refs/heads/auto c: 0aeb9f6 h: refs/heads/master i: 211897: 25d904d 211895: 391ac66 v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: fd3b6ca508ed99004a11291ef1d2c64104102a41
+refs/heads/auto: 0aeb9f6f08c353c71d962d5cc7a231e73040ca3c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libcollections/linked_list.rs b/branches/auto/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`