From d1c27ba9e06e08e1dc27b493144e467d0efd526c Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 15 Sep 2011 12:52:09 -0700 Subject: [PATCH] Revert "Make option::get return the option contents by reference" due to memory corruption This reverts commit fc0bf125168ec3df75bc57c250a62d3ea225a546. --- 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 53c19ba8c0a..c10c22ae18d 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 { - alt opt { some(x) { ret x; } none. { fail "option none"; } } +fn get<@T>(opt: t) -> T { + alt opt { some(x) { x } none. { fail "option none" } } } fn map<@T, @U>(f: block(T) -> U, opt: t) -> t {