diff options
| author | Patrick Walton <[email protected]> | 2010-11-05 10:41:23 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2010-11-05 10:41:23 -0700 |
| commit | 2fcf81cc4b132bf7d862f5144d282391b38d0c15 (patch) | |
| tree | d6e2c25528a83959111707cd7e29b4b30b93cf6a /src/lib/list.rs | |
| parent | rustboot: Describe the cycle when reporting a cyclic import error (diff) | |
| download | rust-2fcf81cc4b132bf7d862f5144d282391b38d0c15.tar.xz rust-2fcf81cc4b132bf7d862f5144d282391b38d0c15.zip | |
Revert "Move the option type to its own module"
Diffstat (limited to 'src/lib/list.rs')
| -rw-r--r-- | src/lib/list.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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)) { |