---

yaml
---
r: 22783
b: refs/heads/master
c: 8209b2e
h: refs/heads/master
i:
  22781: 6d23623
  22779: 878f881
  22775: 79258d0
  22767: ce6ce5c
  22751: c31198a
  22719: 4d49670
  22655: 3da9029
  22527: 8f84e2e
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 44631722ff234241cb7100103320a402fe4fdfa9
+refs/heads/master: 8209b2e9b383b9e38a09b1ec79c7b5691aeb5d22
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/tutorial.md

@@ -34,9 +34,8 @@ high-level features include:
 * ***Higher-order functions.*** Rust functions may take closures as
   arguments or return closures as return values.  Closures in Rust are
   very powerful and used pervasively.
-* ***Trait polymorphism.*** Rust's type system features a unique
-  combination of Java-style interfaces and Haskell-style typeclasses
-  called _traits_.
+* ***Interface polymorphism.*** Rust's type system features a unique
+  combination of Java-style interfaces and Haskell-style typeclasses.
 * ***Parametric polymorphism (generics).*** Functions and types can be
   parameterized over type variables with optional type constraints.
 * ***Type inference.*** Type annotations on local variable
@@ -735,12 +734,9 @@ of numeric literal patterns can be expressed with `to`. The underscore
 (`_`) is a wildcard pattern that matches everything.
 
 If the arm with the wildcard pattern was left off in the above
-example, the typechecker would reject it at compile time. `alt`
-constructs must be exhaustive: they must have an arm covering every
-possible case. (You may use the `alt check` construct to write a
-non-exhaustive match, but it's highly undesirable to do so. You may
-reason that the missing cases will never occur, but the typechecker
-provides you with no assurance that your reasoning is correct.)
+example, running it on a number greater than ten (or negative) would
+cause a run-time failure. When no arm matches, `alt` constructs do not
+silently fall through—they blow up instead.
 
 A powerful application of pattern matching is *destructuring*, where
 you use the matching to get at the contents of data types. Remember
@@ -2093,9 +2089,9 @@ resource type. Rust has several kinds that can be used as type bounds:
   mutable fields nor shared boxes.
 
 > ***Note:*** Rust type kinds are syntactically very similar to
-> [traits](#traits) when used as type bounds, and can be
-> conveniently thought of as built-in traits. In the future type
-> kinds will actually be traits that the compiler has special
+> [interfaces](#interfaces) when used as type bounds, and can be
+> conveniently thought of as built-in interfaces. In the future type
+> kinds will actually be interfaces that the compiler has special
 > knowledge about.
 
 ## Generic functions and argument-passing
@@ -2392,9 +2388,9 @@ This makes it possible to rebind a variable without actually mutating
 it, which is mostly useful for destructuring (which can rebind, but
 not assign).
 
-# Traits
+# Interfaces
 
-Traits are Rust's take on value polymorphism—the thing that
+Interfaces are Rust's take on value polymorphism—the thing that
 object-oriented languages tend to solve with methods and inheritance.
 For example, writing a function that can operate on multiple types of
 collections.
@@ -2404,27 +2400,27 @@ collections.
 
 ## Declaration
 
-A trait consists of a set of methods. A method is a function that
+An interface consists of a set of methods. A method is a function that
 can be applied to a `self` value and a number of arguments, using the
 dot notation: `self.foo(arg1, arg2)`.
 
-For example, we could declare the trait `to_str` for things that
+For example, we could declare the interface `to_str` for things that
 can be converted to a string, with a single method of the same name:
 
 ~~~~
-trait to_str {
+iface to_str {
     fn to_str() -> ~str;
 }
 ~~~~
 
 ## Implementation
 
-To actually implement an trait for a given type, the `impl` form
+To actually implement an interface for a given type, the `impl` form
 is used. This defines implementations of `to_str` for the `int` and
 `~str` types.
 
 ~~~~
-# trait to_str { fn to_str() -> ~str; }
+# iface to_str { fn to_str() -> ~str; }
 impl of to_str for int {
     fn to_str() -> ~str { int::to_str(self, 10u) }
 }
@@ -2443,13 +2439,13 @@ method that matches the name, and simply calls that.
 
 Implementations are not globally visible. Resolving a method to an
 implementation requires that implementation to be in scope. You can
-import and export implementations using the name of the trait they
+import and export implementations using the name of the interface they
 implement (multiple implementations with the same name can be in scope
 without problems). Or you can give them an explicit name if you
 prefer, using this syntax:
 
 ~~~~
-# trait to_str { fn to_str() -> ~str; }
+# iface to_str { fn to_str() -> ~str; }
 impl nil_to_str of to_str for () {
     fn to_str() -> ~str { ~"()" }
 }
@@ -2465,7 +2461,7 @@ known at compile time, it is possible to specify 'bounds' for type
 parameters.
 
 ~~~~
-# trait to_str { fn to_str() -> ~str; }
+# iface to_str { fn to_str() -> ~str; }
 fn comma_sep<T: to_str>(elts: ~[T]) -> ~str {
     let mut result = ~"", first = true;
     for elts.each |elt| {
@@ -2480,18 +2476,18 @@ fn comma_sep<T: to_str>(elts: ~[T]) -> ~str {
 The syntax for this is similar to the syntax for specifying that a
 parameter type has to be copyable (which is, in principle, another
 kind of bound). By declaring `T` as conforming to the `to_str`
-trait, it becomes possible to call methods from that trait on
+interface, it becomes possible to call methods from that interface on
 values of that type inside the function. It will also cause a
 compile-time error when anyone tries to call `comma_sep` on an array
 whose element type does not have a `to_str` implementation in scope.
 
-## Polymorphic traits
+## Polymorphic interfaces
 
-Traits may contain type parameters. This defines a trait for
+Interfaces may contain type parameters. This defines an interface for
 generalized sequence types:
 
 ~~~~
-trait seq<T> {
+iface seq<T> {
     fn len() -> uint;
     fn iter(fn(T));
 }
@@ -2503,26 +2499,26 @@ impl <T> of seq<T> for ~[T] {
 }
 ~~~~
 
-Note that the implementation has to explicitly declare the type
-parameter that it binds, `T`, before using it to specify its trait type. This is
+Note that the implementation has to explicitly declare the its
+parameter `T` before using it to specify its interface type. This is
 needed because it could also, for example, specify an implementation
 of `seq<int>`—the `of` clause *refers* to a type, rather than defining
 one.
 
-The type parameters bound by a trait are in scope in each of the
+The type parameters bound by an iface are in scope in each of the
 method declarations. So, re-declaring the type parameter
-`T` as an explicit type parameter for `len` -- in either the trait or
+`T` as an explicit type parameter for `len` -- in either the iface or
 the impl -- would be a compile-time error.
 
-## The `self` type in traits
+## The `self` type in interfaces
 
-In a trait, `self` is a special type that you can think of as a
-type parameter. An implementation of the trait for any given type
+In an interface, `self` is a special type that you can think of as a
+type parameter. An implementation of the interface for any given type
 `T` replaces the `self` type parameter with `T`. The following
-trait describes types that support an equality operation:
+interface describes types that support an equality operation:
 
 ~~~~
-trait eq {
+iface eq {
   fn equals(&&other: self) -> bool;
 }
 
@@ -2534,15 +2530,15 @@ impl of eq for int {
 Notice that `equals` takes an `int` argument, rather than a `self` argument, in
 an implementation for type `int`.
 
-## Casting to an trait type
+## Casting to an interface type
 
 The above allows us to define functions that polymorphically act on
-values of *an* unknown type that conforms to a given trait.
+values of *an* unknown type that conforms to a given interface.
 However, consider this function:
 
 ~~~~
 # type circle = int; type rectangle = int;
-# trait drawable { fn draw(); }
+# iface drawable { fn draw(); }
 # impl of drawable for int { fn draw() {} }
 # fn new_circle() -> int { 1 }
 fn draw_all<T: drawable>(shapes: ~[T]) {
@@ -2553,14 +2549,14 @@ fn draw_all<T: drawable>(shapes: ~[T]) {
 ~~~~
 
 You can call that on an array of circles, or an array of squares
-(assuming those have suitable `drawable` traits defined), but not
+(assuming those have suitable `drawable` interfaces defined), but not
 on an array containing both circles and squares.
 
-When this is needed, a trait name can be used as a type, causing
+When this is needed, an interface name can be used as a type, causing
 the function to be written simply like this:
 
 ~~~~
-# trait drawable { fn draw(); }
+# iface drawable { fn draw(); }
 fn draw_all(shapes: ~[drawable]) {
     for shapes.each |shape| { shape.draw(); }
 }
@@ -2575,11 +2571,11 @@ is very similar to the 'vtables' used in most object-oriented
 languages.
 
 To construct such a value, you use the `as` operator to cast a value
-to a trait type:
+to an interface type:
 
 ~~~~
 # type circle = int; type rectangle = int;
-# trait drawable { fn draw(); }
+# iface drawable { fn draw(); }
 # impl of drawable for int { fn draw() {} }
 # fn new_circle() -> int { 1 }
 # fn new_rectangle() -> int { 2 }
@@ -2598,10 +2594,10 @@ Note that the allocation of a box is somewhat more expensive than
 simply using a type parameter and passing in the value as-is, and much
 more expensive than statically resolved method calls.
 
-## Trait-less implementations
+## Interface-less implementations
 
 If you only intend to use an implementation for static overloading,
-and there is no trait available that it conforms to, you are free
+and there is no interface available that it conforms to, you are free
 to leave off the `of` clause.  However, this is only possible when you
 are defining an implementation in the same module as the receiver
 type, and the receiver type is a named type (i.e., an enum or a
@@ -2624,10 +2620,9 @@ OpenSSL libraries installed, it should 'just work'.
 
 ~~~~ {.xfail-test}
 use std;
-import libc::c_uint;
 
 extern mod crypto {
-    fn SHA1(src: *u8, sz: c_uint, out: *u8) -> *u8;
+    fn SHA1(src: *u8, sz: uint, out: *u8) -> *u8;
 }
 
 fn as_hex(data: ~[u8]) -> ~str {
@@ -2639,7 +2634,7 @@ fn as_hex(data: ~[u8]) -> ~str {
 fn sha1(data: ~str) -> ~str unsafe {
     let bytes = str::bytes(data);
     let hash = crypto::SHA1(vec::unsafe::to_ptr(bytes),
-                            vec::len(bytes) as c_uint, ptr::null());
+                            vec::len(bytes), ptr::null());
     ret as_hex(vec::unsafe::from_buf(hash, 20u));
 }
 
@@ -2705,7 +2700,7 @@ return a pointer.
 
 ~~~~ {.xfail-test}
 # extern mod crypto {
-fn SHA1(src: *u8, sz: libc::c_uint, out: *u8) -> *u8;
+fn SHA1(src: *u8, sz: uint, out: *u8) -> *u8;
 # }
 ~~~~
 
@@ -2796,7 +2791,7 @@ This pointer will become invalid as soon as the vector it points into
 is cleaned up, so you should be very careful how you use it. In this
 case, the local variable `bytes` outlives the pointer, so we're good.
 
-Passing a null pointer as the third argument to `SHA1` makes it use a
+Passing a null pointer as third argument to `SHA1` causes it to use a
 static buffer, and thus save us the effort of allocating memory
 ourselves. `ptr::null` is a generic function that will return an
 unsafe null pointer of the correct type (Rust generics are awesome
@@ -2819,17 +2814,15 @@ microsecond-resolution timer.
 
 ~~~~
 use std;
-import libc::c_ulonglong;
-
-type timeval = {mut tv_sec: c_ulonglong,
-                mut tv_usec: c_ulonglong};
+type timeval = {mut tv_sec: uint,
+                mut tv_usec: uint};
 #[nolink]
-extern mod lib_c {
+extern mod libc {
     fn gettimeofday(tv: *timeval, tz: *()) -> i32;
 }
 fn unix_time_in_microseconds() -> u64 unsafe {
-    let x = {mut tv_sec: 0 as c_ulonglong, mut tv_usec: 0 as c_ulonglong};
-    lib_c::gettimeofday(ptr::addr_of(x), ptr::null());
+    let x = {mut tv_sec: 0u, mut tv_usec: 0u};
+    libc::gettimeofday(ptr::addr_of(x), ptr::null());
     ret (x.tv_sec as u64) * 1000_000_u64 + (x.tv_usec as u64);
 }
 
@@ -2845,8 +2838,8 @@ define a record type with the same contents, and declare
 
 The second argument to `gettimeofday` (the time zone) is not used by
 this program, so it simply declares it to be a pointer to the nil
-type. Since all null pointers have the same representation regardless of
-their referent type, this is safe.
+type. Since null pointer look the same, no matter which type they are
+supposed to point at, this is safe.
 
 # Tasks
 

trunk/mk/tests.mk

@@ -95,9 +95,6 @@ cleantestlibs:
 check: cleantestlibs cleantmptestlogs tidy all check-stage2
 	$(Q)$(S)src/etc/check-summary.py tmp/*.log
 
-check-notidy: cleantestlibs cleantmptestlogs all check-stage2
-	$(Q)$(S)src/etc/check-summary.py tmp/*.log
-
 check-full: cleantestlibs cleantmptestlogs tidy \
             all check-stage1 check-stage2 check-stage3
 	$(Q)$(S)src/etc/check-summary.py tmp/*.log