Make option::get return the option contents by reference

marijnh · marijnh · commit fc0bf125168e · 2011-09-15T17:49:29.000+02:00
I can't believe this actually works!
diff --git a/src/lib/option.rs b/src/lib/option.rs
@@ -2,8 +2,8 @@
 
 tag t<@T> { none; some(T); }
 
-fn get<@T>(opt: t<T>) -> T {
-    alt opt { some(x) { x } none. { fail "option none" } }
+fn get<@T>(opt: t<T>) -> &T {
+    alt opt { some(x) { ret x; } none. { fail "option none"; } }
 }
 
 fn map<@T, @U>(f: block(T) -> U, opt: t<T>) -> t<U> {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`tag t<@T> { none; some(T); }`
`4`	`4`
`5`		`-fn get<@T>(opt: t<T>) -> T {`
`6`		`- alt opt { some(x) { x } none. { fail "option none" } }`
	`5`	`+fn get<@T>(opt: t<T>) -> &T {`
	`6`	`+ alt opt { some(x) { ret x; } none. { fail "option none"; } }`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`fn map<@T, @U>(f: block(T) -> U, opt: t<T>) -> t<U> {`