---

yaml
---
r: 11816
b: refs/heads/master
c: b968c8e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a38ccf12547b1bdb37dce3c7edca5b95a898326a
+refs/heads/master: b968c8e6cd362567bf0047a96d261691dfca43e8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/doc/tutorial.md

@@ -1540,11 +1540,11 @@ You can then declare a function to take a `circular_buf<u8>` or return
 an `option<str>`, or even an `option<T>` if the function itself is
 generic.
 
-The `option` type given above exists in the core library as
-`option::t`, and is the way Rust programs express the thing that in C
-would be a nullable pointer. The nice part is that you have to
-explicitly unpack an `option` type, so accidental null pointer
-dereferences become impossible.
+The `option` type given above exists in the core library and is the
+way Rust programs express the thing that in C would be a nullable
+pointer. The nice part is that you have to explicitly unpack an
+`option` type, so accidental null pointer dereferences become
+impossible.
 
 ## Type-inference and generics
 
@@ -1562,7 +1562,7 @@ you really want to have such a statement, you'll have to write it like
 this:
 
 ~~~~
-let n2: option::t<int> = option::none;
+let n2: option<int> = option::none;
 // or
 let n = option::none::<int>;
 ~~~~

trunk/src/libcore/comm.rs

@@ -167,7 +167,7 @@ fn recv_<T: send>(p: *rust_port) -> T {
 #[doc = "Receive on one of two ports"]
 fn select2<A: send, B: send>(
     p_a: port<A>, p_b: port<B>
-) -> either::t<A, B> unsafe {
+) -> either<A, B> unsafe {
 
     fn select(dptr: **rust_port, ports: **rust_port,
               n_ports: libc::size_t, yield: *libc::uintptr_t) {

trunk/src/libcore/core.rs

@@ -3,7 +3,9 @@
 // Export various ubiquitous types, constructors, methods.
 
 import option::{some, none};
-import option = option::t;
+import option = option::option;
+import either = either::either;
+import result = result::result;
 import path = path::path;
 import vec::vec_len;
 export path, option, some, none, vec_len, unreachable;

trunk/src/libcore/either.rs

@@ -1,13 +1,13 @@
 #[doc = "A type that represents one of two alternatives"];
 
 #[doc = "The either type"]
-enum t<T, U> {
+enum either<T, U> {
     left(T),
     right(U)
 }
 
 fn either<T, U, V>(f_left: fn(T) -> V,
-                   f_right: fn(U) -> V, value: t<T, U>) -> V {
+                   f_right: fn(U) -> V, value: either<T, U>) -> V {
     #[doc = "
     Applies a function based on the given either value
 
@@ -19,27 +19,27 @@ fn either<T, U, V>(f_left: fn(T) -> V,
     alt value { left(l) { f_left(l) } right(r) { f_right(r) } }
 }
 
-fn lefts<T: copy, U>(eithers: [t<T, U>]) -> [T] {
+fn lefts<T: copy, U>(eithers: [either<T, U>]) -> [T] {
     #[doc = "Extracts from a vector of either all the left values"];
 
     let mut result: [T] = [];
-    for elt: t<T, U> in eithers {
+    for elt: either<T, U> in eithers {
         alt elt { left(l) { result += [l]; } _ {/* fallthrough */ } }
     }
     ret result;
 }
 
-fn rights<T, U: copy>(eithers: [t<T, U>]) -> [U] {
+fn rights<T, U: copy>(eithers: [either<T, U>]) -> [U] {
     #[doc = "Extracts from a vector of either all the right values"];
 
     let mut result: [U] = [];
-    for elt: t<T, U> in eithers {
+    for elt: either<T, U> in eithers {
         alt elt { right(r) { result += [r]; } _ {/* fallthrough */ } }
     }
     ret result;
 }
 
-fn partition<T: copy, U: copy>(eithers: [t<T, U>])
+fn partition<T: copy, U: copy>(eithers: [either<T, U>])
     -> {lefts: [T], rights: [U]} {
     #[doc = "
     Extracts from a vector of either all the left values and right values
@@ -50,13 +50,13 @@ fn partition<T: copy, U: copy>(eithers: [t<T, U>])
 
     let mut lefts: [T] = [];
     let mut rights: [U] = [];
-    for elt: t<T, U> in eithers {
+    for elt: either<T, U> in eithers {
         alt elt { left(l) { lefts += [l]; } right(r) { rights += [r]; } }
     }
     ret {lefts: lefts, rights: rights};
 }
 
-pure fn flip<T: copy, U: copy>(eith: t<T, U>) -> t<U, T> {
+pure fn flip<T: copy, U: copy>(eith: either<T, U>) -> either<U, T> {
     #[doc = "Flips between left and right of a given either"];
 
     alt eith {
@@ -65,7 +65,8 @@ pure fn flip<T: copy, U: copy>(eith: t<T, U>) -> t<U, T> {
     }
 }
 
-pure fn to_result<T: copy, U: copy>(eith: t<T, U>) -> result::t<U, T> {
+pure fn to_result<T: copy, U: copy>(
+    eith: either<T, U>) -> result<U, T> {
     #[doc = "
     Converts either::t to a result::t
 
@@ -79,13 +80,13 @@ pure fn to_result<T: copy, U: copy>(eith: t<T, U>) -> result::t<U, T> {
     }
 }
 
-pure fn is_left<T, U>(eith: t<T, U>) -> bool {
+pure fn is_left<T, U>(eith: either<T, U>) -> bool {
     #[doc = "Checks whether the given value is a left"];
 
     alt eith { left(_) { true } _ { false } }
 }
 
-pure fn is_right<T, U>(eith: t<T, U>) -> bool {
+pure fn is_right<T, U>(eith: either<T, U>) -> bool {
     #[doc = "Checks whether the given value is a right"];
 
     alt eith { right(_) { true } _ { false } }
@@ -116,14 +117,14 @@ fn test_lefts() {
 
 #[test]
 fn test_lefts_none() {
-    let input: [t<int, int>] = [right(10), right(10)];
+    let input: [either<int, int>] = [right(10), right(10)];
     let result = lefts(input);
     assert (vec::len(result) == 0u);
 }
 
 #[test]
 fn test_lefts_empty() {
-    let input: [t<int, int>] = [];
+    let input: [either<int, int>] = [];
     let result = lefts(input);
     assert (vec::len(result) == 0u);
 }
@@ -137,14 +138,14 @@ fn test_rights() {
 
 #[test]
 fn test_rights_none() {
-    let input: [t<int, int>] = [left(10), left(10)];
+    let input: [either<int, int>] = [left(10), left(10)];
     let result = rights(input);
     assert (vec::len(result) == 0u);
 }
 
 #[test]
 fn test_rights_empty() {
-    let input: [t<int, int>] = [];
+    let input: [either<int, int>] = [];
     let result = rights(input);
     assert (vec::len(result) == 0u);
 }
@@ -162,23 +163,23 @@ fn test_partition() {
 
 #[test]
 fn test_partition_no_lefts() {
-    let input: [t<int, int>] = [right(10), right(11)];
+    let input: [either<int, int>] = [right(10), right(11)];
     let result = partition(input);
     assert (vec::len(result.lefts) == 0u);
     assert (vec::len(result.rights) == 2u);
 }
 
 #[test]
 fn test_partition_no_rights() {
-    let input: [t<int, int>] = [left(10), left(11)];
+    let input: [either<int, int>] = [left(10), left(11)];
     let result = partition(input);
     assert (vec::len(result.lefts) == 2u);
     assert (vec::len(result.rights) == 0u);
 }
 
 #[test]
 fn test_partition_empty() {
-    let input: [t<int, int>] = [];
+    let input: [either<int, int>] = [];
     let result = partition(input);
     assert (vec::len(result.lefts) == 0u);
     assert (vec::len(result.rights) == 0u);

trunk/src/libcore/f32.rs

@@ -20,8 +20,6 @@ export lgamma, ln, log_radix, ln1p, log10, log2, ilog_radix;
 export modf, pow, round, sin, sinh, sqrt, tan, tanh, tgamma, trunc;
 export signbit;
 
-type t = f32;
-
 // These are not defined inside consts:: for consistency with
 // the integer types
 

trunk/src/libcore/f64.rs

@@ -21,8 +21,6 @@ export modf, pow, round, sin, sinh, sqrt, tan, tanh, tgamma, trunc;
 export signbit;
 export epsilon;
 
-type t = f64;
-
 // These are not defined inside consts:: for consistency with
 // the integer types
 

trunk/src/libcore/float.rs

@@ -26,8 +26,6 @@ export j0, j1, jn, y0, y1, yn;
 import m_float = f64;
 import f64::*;
 
-type t = float;
-
 /**
  * Section: String Conversions
  */

trunk/src/libcore/future.rs

@@ -20,8 +20,6 @@ export get;
 export with;
 export spawn;
 
-import either = either::t;
-
 #[doc = "The future type"]
 enum future<A> = {
     mutable v: either<@A, fn@() -> A>

trunk/src/libcore/io.rs

@@ -218,7 +218,7 @@ fn FILE_reader(f: *libc::FILE, cleanup: bool) -> reader {
 
 fn stdin() -> reader { rustrt::rust_get_stdin() as reader }
 
-fn file_reader(path: str) -> result::t<reader, str> {
+fn file_reader(path: str) -> result<reader, str> {
     let f = os::as_c_charp(path, {|pathbuf|
         os::as_c_charp("r", {|modebuf|
             libc::fopen(pathbuf, modebuf)
@@ -374,7 +374,7 @@ fn fd_writer(fd: fd_t, cleanup: bool) -> writer {
 
 
 fn mk_file_writer(path: str, flags: [fileflag])
-    -> result::t<writer, str> {
+    -> result<writer, str> {
 
     #[cfg(target_os = "win32")]
     fn wb() -> c_int { (O_WRONLY | O_BINARY) as c_int }
@@ -487,13 +487,13 @@ impl writer_util for writer {
     fn write_u8(n: u8) { self.write([n]) }
 }
 
-fn file_writer(path: str, flags: [fileflag]) -> result::t<writer, str> {
+fn file_writer(path: str, flags: [fileflag]) -> result<writer, str> {
     result::chain(mk_file_writer(path, flags), { |w| result::ok(w)})
 }
 
 
 // FIXME: fileflags
-fn buffered_file_writer(path: str) -> result::t<writer, str> {
+fn buffered_file_writer(path: str) -> result<writer, str> {
     let f = os::as_c_charp(path) {|pathbuf|
         os::as_c_charp("w") {|modebuf|
             libc::fopen(pathbuf, modebuf)
@@ -581,15 +581,15 @@ fn seek_in_buf(offset: int, pos: uint, len: uint, whence: seek_style) ->
     ret bpos as uint;
 }
 
-fn read_whole_file_str(file: str) -> result::t<str, str> {
+fn read_whole_file_str(file: str) -> result<str, str> {
     result::chain(read_whole_file(file), { |bytes|
         result::ok(str::from_bytes(bytes))
     })
 }
 
 // FIXME implement this in a low-level way. Going through the abstractions is
 // pointless.
-fn read_whole_file(file: str) -> result::t<[u8], str> {
+fn read_whole_file(file: str) -> result<[u8], str> {
     result::chain(file_reader(file), { |rdr|
         result::ok(rdr.read_whole_stream())
     })

trunk/src/libcore/option.rs

@@ -8,12 +8,12 @@ languages you might use a nullable type, in Rust you would use an option type.
 "];
 
 #[doc = "The option type"]
-enum t<T> {
+enum option<T> {
     none,
     some(T),
 }
 
-pure fn get<T: copy>(opt: t<T>) -> T {
+pure fn get<T: copy>(opt: option<T>) -> T {
     #[doc = "
     Gets the value out of an option
 
@@ -25,13 +25,13 @@ pure fn get<T: copy>(opt: t<T>) -> T {
     alt opt { some(x) { ret x; } none { fail "option none"; } }
 }
 
-fn map<T, U: copy>(opt: t<T>, f: fn(T) -> U) -> t<U> {
+fn map<T, U: copy>(opt: option<T>, f: fn(T) -> U) -> option<U> {
     #[doc = "Maps a `some` value from one type to another"];
 
     alt opt { some(x) { some(f(x)) } none { none } }
 }
 
-fn chain<T, U>(opt: t<T>, f: fn(T) -> t<U>) -> t<U> {
+fn chain<T, U>(opt: option<T>, f: fn(T) -> option<U>) -> option<U> {
     #[doc = "
     Update an optional value by optionally running its content through a
     function that returns an option.
@@ -40,37 +40,37 @@ fn chain<T, U>(opt: t<T>, f: fn(T) -> t<U>) -> t<U> {
     alt opt { some(x) { f(x) } none { none } }
 }
 
-pure fn is_none<T>(opt: t<T>) -> bool {
+pure fn is_none<T>(opt: option<T>) -> bool {
     #[doc = "Returns true if the option equals `none`"];
 
     alt opt { none { true } some(_) { false } }
 }
 
-pure fn is_some<T>(opt: t<T>) -> bool {
+pure fn is_some<T>(opt: option<T>) -> bool {
     #[doc = "Returns true if the option contains some value"];
 
     !is_none(opt)
 }
 
-pure fn from_maybe<T: copy>(def: T, opt: t<T>) -> T {
+pure fn from_maybe<T: copy>(def: T, opt: option<T>) -> T {
     #[doc = "Returns the contained value or a default"];
 
     alt opt { some(x) { x } none { def } }
 }
 
-fn maybe<T, U: copy>(def: U, opt: t<T>, f: fn(T) -> U) -> U {
+fn maybe<T, U: copy>(def: U, opt: option<T>, f: fn(T) -> U) -> U {
     #[doc = "Applies a function to the contained value or returns a default"];
 
     alt opt { none { def } some(t) { f(t) } }
 }
 
-fn may<T>(opt: t<T>, f: fn(T)) {
+fn may<T>(opt: option<T>, f: fn(T)) {
     #[doc = "Performs an operation on the contained value or does nothing"];
 
     alt opt { none { } some(t) { f(t); } }
 }
 
-fn unwrap<T>(-opt: t<T>) -> T unsafe {
+fn unwrap<T>(-opt: option<T>) -> T unsafe {
     #[doc = "
     Moves a value out of an option type and returns it.
 

trunk/src/libcore/os.rs

@@ -21,7 +21,6 @@ import libc::{c_char, c_void, c_int, c_uint, size_t, ssize_t,
 import libc::{close, fclose};
 
 import option::{some, none};
-import option = option::t;
 
 import getcwd = rustrt::rust_getcwd;
 import consts::*;