---

yaml
---
r: 23483
b: refs/heads/master
c: 6cf2f89
h: refs/heads/master
i:
  23481: f68a6cb
  23479: 7f29815
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bed37a1dc915cbc8e7333ee6822b03b096347356
+refs/heads/master: 6cf2f89452675d231956324333180810273625b0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/option.rs

@@ -44,13 +44,14 @@ pure fn get_ref<T>(opt: &r/option<T>) -> &r/T {
 }
 
 pure fn expect<T: copy>(opt: option<T>, reason: ~str) -> T {
-    #[doc = "
-    Gets the value out of an option, printing a specified message on failure
-
-    # Failure
-
-    Fails if the value equals `none`
-    "];
+    /*!
+     * Gets the value out of an option, printing a specified message on
+     * failure
+     *
+     * # Failure
+     *
+     * Fails if the value equals `none`
+     */
     match opt { some(x) => x, none => fail reason }
 }
 
@@ -165,15 +166,9 @@ pure fn unwrap<T>(+opt: option<T>) -> T {
      * Useful primarily for getting strings, vectors and unique pointers out
      * of option types without copying them.
      */
-
-    unsafe {
-        let addr = match opt {
-          some(x) => ptr::addr_of(x),
-          none => fail ~"option::unwrap none"
-        };
-        let liberated_value = unsafe::reinterpret_cast(*addr);
-        unsafe::forget(opt);
-        return liberated_value;
+    match move opt {
+        some(move x) => x,
+        none => fail ~"option::unwrap none"
     }
 }