From e7d26a491724f347059a2f89cc4da676b6d2c970 Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Tue, 31 Jul 2012 13:21:15 -0400
Subject: make option::map_default<T,U> instead of U:copy

---
 src/libcore/option.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 270ba90c704..074dd086926 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -88,7 +88,7 @@ pure fn get_default<T: copy>(opt: option<T>, def: T) -> T {
     alt opt { some(x) { x } none { def } }
 }
 
-pure fn map_default<T, U: copy>(opt: option<T>, def: U, f: fn(T) -> U) -> U {
+pure fn map_default<T, U>(opt: option<T>, +def: U, f: fn(T) -> U) -> U {
     //! Applies a function to the contained value or returns a default
 
     alt opt { none { def } some(t) { f(t) } }
@@ -133,7 +133,7 @@ impl extensions<T> for option<T> {
      */
     pure fn chain<U>(f: fn(T) -> option<U>) -> option<U> { chain(self, f) }
     /// Applies a function to the contained value or returns a default
-    pure fn map_default<U: copy>(def: U, f: fn(T) -> U) -> U
+    pure fn map_default<U>(+def: U, f: fn(T) -> U) -> U
         { map_default(self, def, f) }
     /// Performs an operation on the contained value or does nothing
     pure fn iter(f: fn(T)) { iter(self, f) }
-- 
cgit 1.4.1-3-g733a5