---

Brian J. Burg · Brian J. Burg · commit b9b22df1dcaf · 2012-11-08T16:25:22.000-08:00
yaml --- r: 38902 b: refs/heads/incoming c: a5718ba h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 17020244e476b5a40b0d2eb576574a0cf5543d80
+refs/heads/incoming: a5718ba377fbc915618062d7562229a4eb754c9f
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/option.rs b/branches/incoming/src/libcore/option.rs
@@ -85,16 +85,17 @@ pub pure fn get_ref<T>(opt: &r/Option<T>) -> &r/T {
     }
 }
 
-pub pure fn expect<T: Copy>(opt: Option<T>, reason: ~str) -> T {
+pub pure fn expect<T>(opt: Option<T>, reason: ~str) -> T {
     /*!
-     * Gets the value out of an option, printing a specified message on
-     * failure
+     * Gets the value out of an option without copying, printing a 
+     * specified message on failure.
      *
      * # Failure
      *
      * Fails if the value equals `none`
      */
-    match opt { Some(copy x) => x, None => fail reason }
+    if opt.is_some() { move option::unwrap(move opt) }
+    else { fail reason }
 }
 
 pub pure fn map<T, U>(opt: &Option<T>, f: fn(x: &T) -> U) -> Option<U> {

Original file line number	Diff line number	Diff line change
`@@ -85,16 +85,17 @@ pub pure fn get_ref<T>(opt: &r/Option<T>) -> &r/T {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`-pub pure fn expect<T: Copy>(opt: Option<T>, reason: ~str) -> T {`
	`88`	`+pub pure fn expect<T>(opt: Option<T>, reason: ~str) -> T {`
`89`	`89`	`/*!`
`90`		`- * Gets the value out of an option, printing a specified message on`
`91`		`- * failure`
	`90`	`+ * Gets the value out of an option without copying, printing a`
	`91`	`+ * specified message on failure.`
`92`	`92`	`*`
`93`	`93`	`* # Failure`
`94`	`94`	`*`
`95`	`95`	* Fails if the value equals `none`
`96`	`96`	`*/`
`97`		`- match opt { Some(copy x) => x, None => fail reason }`
	`97`	`+ if opt.is_some() { move option::unwrap(move opt) }`
	`98`	`+ else { fail reason }`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`pub pure fn map<T, U>(opt: &Option<T>, f: fn(x: &T) -> U) -> Option<U> {`