Change option::t to option

Now that core exports "option" as a synonym for option::t, search-and-
replace option::t with option.

The only place that still refers to option::t are the modules in libcore
that use option, because fixing this requires a new snapshot
(forthcoming).

11 files changed, 12 insertions, 15 deletions

diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs
index 8be28fabd79..338a494ad16 100644
--- a/src/test/bench/task-perf-word-count-generic.rs
+++ b/src/test/bench/task-perf-word-count-generic.rs
@@ -12,7 +12,7 @@
 
 use std;
 
-import option = option::t;
+import option = option;
 import option::some;
 import option::none;
 import str;
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
index 357b062471e..67b1505afd9 100644
--- a/src/test/bench/task-perf-word-count.rs
+++ b/src/test/bench/task-perf-word-count.rs
@@ -10,7 +10,7 @@
 
 use std;
 
-import option = option::t;
+import option = option;
 import option::{some, none};
 import std::{map, io, time};
 import io::reader_util;
diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs
index 4e708726864..6ebc4a27626 100644
--- a/src/test/compile-fail/pattern-tyvar-2.rs
+++ b/src/test/compile-fail/pattern-tyvar-2.rs
@@ -6,7 +6,7 @@ import option::some;
 
 // error-pattern: mismatched types
 
-enum bar { t1((), option::t<[int]>), t2, }
+enum bar { t1((), option<[int]>), t2, }
 
 fn foo(t: bar) -> int { alt t { t1(_, some(x)) { ret x * 3; } _ { fail; } } }
 
diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs
index 05028b7a3ed..607e32685f3 100644
--- a/src/test/compile-fail/pattern-tyvar.rs
+++ b/src/test/compile-fail/pattern-tyvar.rs
@@ -5,7 +5,7 @@ import option::some;
 
 // error-pattern: mismatched types
 
-enum bar { t1((), option::t<[int]>), t2, }
+enum bar { t1((), option<[int]>), t2, }
 
 fn foo(t: bar) {
     alt t {
diff --git a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
index 0c0ea02164c..e429db659ab 100644
--- a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
+++ b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
@@ -1,6 +1,6 @@
 // -*- rust -*-
 // xfail-test
-// error-pattern:option::t
+// error-pattern:option
 use std;
 import vec::*;
 
diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/run-pass/alias-uninit-value.rs
index 01b850dabeb..0679022d37a 100644
--- a/src/test/run-pass/alias-uninit-value.rs
+++ b/src/test/run-pass/alias-uninit-value.rs
@@ -7,9 +7,9 @@ import option::none;
 
 enum sty { ty_nil, }
 
-type raw_t = {struct: sty, cname: option::t<str>, hash: uint};
+type raw_t = {struct: sty, cname: option<str>, hash: uint};
 
-fn mk_raw_ty(st: sty, cname: option::t<str>) -> raw_t {
+fn mk_raw_ty(st: sty, cname: option<str>) -> raw_t {
     ret {struct: st, cname: cname, hash: 0u};
 }
 
diff --git a/src/test/run-pass/alt-join.rs b/src/test/run-pass/alt-join.rs
index 687cf30f97f..77b52da4acf 100644
--- a/src/test/run-pass/alt-join.rs
+++ b/src/test/run-pass/alt-join.rs
@@ -1,11 +1,8 @@
 
 use std;
 import option;
-import option::t;
-import option::none;
-import option::some;
 
-fn foo<T>(y: option::t<T>) {
+fn foo<T>(y: option<T>) {
     let x: int;
     let rs: [int] = [];
     /* tests that x doesn't get put in the precondition for the
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
index 9301d93874e..eeed3d32800 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/run-pass/hashmap-memory.rs
@@ -6,7 +6,7 @@
 
 use std;
 
-import option = option::t;
+import option = option;
 import option::some;
 import option::none;
 import str;
diff --git a/src/test/run-pass/issue-511.rs b/src/test/run-pass/issue-511.rs
index 36b2e65897e..34e8a8e47b9 100644
--- a/src/test/run-pass/issue-511.rs
+++ b/src/test/run-pass/issue-511.rs
@@ -1,7 +1,7 @@
 use std;
 import option;
 
-fn f<T>(&o: option::t<T>) {
+fn f<T>(&o: option<T>) {
     assert o == option::none;
 }
 
diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/run-pass/nested-pattern.rs
index 2bd5e9ff330..6eda8f11489 100644
--- a/src/test/run-pass/nested-pattern.rs
+++ b/src/test/run-pass/nested-pattern.rs
@@ -6,7 +6,7 @@ import option;
 import option::some;
 import option::none;
 
-enum t { foo(int, uint), bar(int, option::t<int>), }
+enum t { foo(int, uint), bar(int, option<int>), }
 
 fn nested(o: t) {
     alt o {
diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
index 9777de4b146..65b793564ad 100644
--- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
+++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
@@ -9,7 +9,7 @@ import option;
 
 enum opt_span {
 
-    //hack (as opposed to option::t), to make `span` compile
+    //hack (as opposed to option), to make `span` compile
     os_none,
     os_some(@span),
 }