---

yaml
---
r: 15989
b: refs/heads/try
c: bb88f77
h: refs/heads/master
i:
  15987: 1932bed
v: v3

Author: olsonjeffery

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: a40f550ed5b159fcfc1540df538b8f0b6acd01a7
+refs/heads/try: bb88f772a457d09616d790fed0f548d63863e5ee
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/result.rs

@@ -218,13 +218,11 @@ fn iter2<S,T,U:copy>(ss: [S], ts: [T],
 
 #[doc="
 Unwraps a result, assuming it is an `ok(T)`
-
-This operation is unsafe.
 "]
 fn unwrap<T, U>(-res: result<T, U>) -> T unsafe {
     let addr = alt res {
       ok(x) { ptr::addr_of(x) }
-      err(_) { fail "option none" }
+      err(_) { fail "error result" }
     };
     let liberated_value = unsafe::reinterpret_cast(*addr);
     unsafe::forget(res);