From d9c664e3fabe50fcf8fadf127d4519b6d7ce595a Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 16 Sep 2011 12:20:06 -0700
Subject: [PATCH] Revert "Revert "Make option::get return the option contents
 by reference" due to memory corruption"

This reverts commit d1c27ba9e06e08e1dc27b493144e467d0efd526c.
---
 src/lib/option.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/option.rs b/src/lib/option.rs
index c10c22ae18da..53c19ba8c0ab 100644
--- 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> {