---

erickt · erickt · commit 43a294adce6e · 2012-08-30T21:11:28.000-07:00
yaml --- r: 30214 b: refs/heads/incoming c: 5c6be13 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 7649860339a0e298be75522d41d243b3bbb178b6
+refs/heads/incoming: 5c6be13b29c44920a39b9b9e95931f734b60d92b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/result.rs b/branches/incoming/src/libcore/result.rs
@@ -348,6 +348,14 @@ fn unwrap<T, U>(+res: Result<T, U>) -> T {
     }
 }
 
+/// Unwraps a result, assuming it is an `err(U)`
+fn unwrap_err<T, U>(+res: Result<T, U>) -> U {
+    match move res {
+      Err(move u) => u,
+      Ok(_) => fail ~"unwrap called on an ok result"
+    }
+}
+
 impl<T:Eq,U:Eq> Result<T,U> : Eq {
     pure fn eq(&&other: Result<T,U>) -> bool {
         match self {

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,14 @@ fn unwrap<T, U>(+res: Result<T, U>) -> T {`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
	`351`	+/// Unwraps a result, assuming it is an `err(U)`
	`352`	`+fn unwrap_err<T, U>(+res: Result<T, U>) -> U {`
	`353`	`+ match move res {`
	`354`	`+ Err(move u) => u,`
	`355`	`+ Ok(_) => fail ~"unwrap called on an ok result"`
	`356`	`+ }`
	`357`	`+}`
	`358`	`+`
`351`	`359`	`impl<T:Eq,U:Eq> Result<T,U> : Eq {`
`352`	`360`	`pure fn eq(&&other: Result<T,U>) -> bool {`
`353`	`361`	`match self {`