---

yaml
---
r: 12983
b: refs/heads/master
c: bb88f77
h: refs/heads/master
i:
  12981: a3a9fbc
  12979: bd7eb68
  12975: c81d057
v: v3

Author: olsonjeffery

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a40f550ed5b159fcfc1540df538b8f0b6acd01a7
+refs/heads/master: bb88f772a457d09616d790fed0f548d63863e5ee
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/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);