summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorJeff Olson <olson.jeffery@gmail.com>2012-05-19 14:05:39 -0700
committerBrian Anderson <banderson@mozilla.com>2012-05-22 22:29:17 -0700
commitbb88f772a457d09616d790fed0f548d63863e5ee (patch)
tree54baf809f201d44747ad27b37cd68768bb5afc4d /src/libcore
parenta40f550ed5b159fcfc1540df538b8f0b6acd01a7 (diff)
downloadrust-bb88f772a457d09616d790fed0f548d63863e5ee.tar.gz
rust-bb88f772a457d09616d790fed0f548d63863e5ee.zip
core: doc/err feedback tweeks for result::unwrap
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/result.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index a8aa250ddad..18d78520bf5 100644
--- a/src/libcore/result.rs
+++ b/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);