---

yaml
---
r: 13543
b: refs/heads/master
c: ff536f3
h: refs/heads/master
i:
  13541: 4ecb7bc
  13539: 0bc3c76
  13535: 74ef21d
v: v3

Author: brson

[refs]

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

trunk/src/libcore/option.rs

@@ -87,20 +87,26 @@ pure fn unwrap<T>(-opt: option<T>) -> T unsafe {
     ret liberated_value;
 }
 
-impl extensions<T:copy> for option<T> {
+impl extensions<T> for option<T> {
     #[doc = "
     Update an optional value by optionally running its content through a
     function that returns an option.
     "]
     fn chain<U>(f: fn(T) -> option<U>) -> option<U> { chain(self, f) }
-    #[doc = "Returns the contained value or a default"]
-    fn get_default(def: T) -> T { get_default(self, def) }
     #[doc = "Applies a function to the contained value or returns a default"]
     fn map_default<U: copy>(def: U, f: fn(T) -> U) -> U
         { map_default(self, def, f) }
     #[doc = "Performs an operation on the contained value or does nothing"]
     fn iter(f: fn(T)) { iter(self, f) }
+    #[doc = "Returns true if the option equals `none`"]
+    fn is_none() -> bool { is_none(self) }
+    #[doc = "Returns true if the option contains some value"]
+    fn is_some() -> bool { is_some(self) }
+    #[doc = "Maps a `some` value from one type to another"]
+    fn map<U:copy>(f: fn(T) -> U) -> option<U> { map(self, f) }
+}
 
+impl extensions<T: copy> for option<T> {
     #[doc = "
     Gets the value out of an option
 
@@ -109,12 +115,7 @@ impl extensions<T:copy> for option<T> {
     Fails if the value equals `none`
     "]
     fn get() -> T { get(self) }
-    #[doc = "Returns true if the option equals `none`"]
-    fn is_none() -> bool { is_none(self) }
-    #[doc = "Returns true if the option contains some value"]
-    fn is_some() -> bool { is_some(self) }
-    #[doc = "Maps a `some` value from one type to another"]
-    fn map<U:copy>(f: fn(T) -> U) -> option<U> { map(self, f) }
+    fn get_default(def: T) -> T { get_default(self, def) }
 }
 
 #[test]