From 2fcf81cc4b132bf7d862f5144d282391b38d0c15 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 5 Nov 2010 10:41:23 -0700
Subject: Revert "Move the option type to its own module"

---
 src/lib/list.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/list.rs')

diff --git a/src/lib/list.rs b/src/lib/list.rs
index 8e0380d1..da8d3c0a 100644
--- a/src/lib/list.rs
+++ b/src/lib/list.rs
@@ -1,7 +1,7 @@
 
-import option;
-import option.some;
-import option.none;
+import util.option;
+import util.some;
+import util.none;
 
 // FIXME: It would probably be more appealing to define this as
 // type list[T] = rec(T hd, option[@list[T]] tl), but at the moment
@@ -27,7 +27,7 @@ fn foldl[T,U](&list[T] ls, &U u, fn(&T t, U u) -> U f) -> U {
 }
 
 fn find[T,U](&list[T] ls,
-             (fn(&T) -> option.t[U]) f) -> option.t[U] {
+             (fn(&T) -> option[U]) f) -> option[U] {
   alt(ls) {
     case (cons[T](?hd, ?tl)) {
         alt (f(hd)) {
-- 
cgit v1.2.3