---

erickt · erickt · commit b238f58493c1 · 2012-08-30T21:11:28.000-07:00
yaml --- r: 28191 b: refs/heads/try c: 7649860 h: refs/heads/master i: 28189: 82aaa3e 28187: 59192dd 28183: 46babdc 28175: 38598d9 28159: 11b729a v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: afeaf7d88cda883428f0b18123f164e5d5a7e4f5
+refs/heads/try: 7649860339a0e298be75522d41d243b3bbb178b6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/libcore/result.rs b/branches/try/src/libcore/result.rs
@@ -341,15 +341,10 @@ fn iter_vec2<S,T,U:copy>(ss: &[S], ts: &[T],
 }
 
 /// Unwraps a result, assuming it is an `ok(T)`
-fn unwrap<T, U>(-res: Result<T, U>) -> T {
-    unsafe {
-        let addr = match res {
-          Ok(x) => ptr::addr_of(x),
-          Err(_) => fail ~"error result"
-        };
-        let liberated_value = unsafe::reinterpret_cast(*addr);
-        unsafe::forget(res);
-        return liberated_value;
+fn unwrap<T, U>(+res: Result<T, U>) -> T {
+    match move res {
+      Ok(move t) => t,
+      Err(_) => fail ~"unwrap called on an err result"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -341,15 +341,10 @@ fn iter_vec2<S,T,U:copy>(ss: &[S], ts: &[T],`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	/// Unwraps a result, assuming it is an `ok(T)`
`344`		`-fn unwrap<T, U>(-res: Result<T, U>) -> T {`
`345`		`- unsafe {`
`346`		`- let addr = match res {`
`347`		`- Ok(x) => ptr::addr_of(x),`
`348`		`- Err(_) => fail ~"error result"`
`349`		`- };`
`350`		`- let liberated_value = unsafe::reinterpret_cast(*addr);`
`351`		`- unsafe::forget(res);`
`352`		`- return liberated_value;`
	`344`	`+fn unwrap<T, U>(+res: Result<T, U>) -> T {`
	`345`	`+ match move res {`
	`346`	`+ Ok(move t) => t,`
	`347`	`+ Err(_) => fail ~"unwrap called on an err result"`
`353`	`348`	`}`
`354`	`349`	`}`
`355`	`350`