---

erickt · erickt · commit 3c92291d4334 · 2012-08-30T21:11:27.000-07:00
yaml --- r: 30212 b: refs/heads/incoming c: afeaf7d 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: c0f357924d8c96d2f8510055ecd79ed0f3e1840b
+refs/heads/incoming: afeaf7d88cda883428f0b18123f164e5d5a7e4f5
 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
@@ -53,7 +53,7 @@ pure fn get_ref<T, U>(res: &a/Result<T, U>) -> &a/T {
 pure fn get_err<T, U: copy>(res: Result<T, U>) -> U {
     match res {
       Err(u) => u,
-      Ok(_) => fail ~"get_error called on ok result"
+      Ok(_) => fail ~"get_err called on ok result"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ pure fn get_ref<T, U>(res: &a/Result<T, U>) -> &a/T {`
`53`	`53`	`pure fn get_err<T, U: copy>(res: Result<T, U>) -> U {`
`54`	`54`	`match res {`
`55`	`55`	`Err(u) => u,`
`56`		`- Ok(_) => fail ~"get_error called on ok result"`
	`56`	`+ Ok(_) => fail ~"get_err called on ok result"`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`