Merge pull request #4243 from erickt/incoming

Fix a bug in Result::unwrap_err (and minor cleanup)
2012-12-23 13:49:32 -08:00
parent 8ec13a90aa beec519316
commit 197a1f9cfe
2 changed files with 40 additions and 79 deletions
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -234,7 +234,7 @@ impl<T, E> Result<T, E> {
    pure fn unwrap(self) -> T { unwrap(self) }

    #[inline(always)]
-    pure fn unwrap_err(self) -> T { unwrap(self) }
+    pure fn unwrap_err(self) -> E { unwrap_err(self) }

    #[inline(always)]
    pure fn chain<U>(self, op: fn(T) -> Result<U,E>) -> Result<U,E> {