---

yaml
---
r: 20756
b: refs/heads/snap-stage3
c: 439afaa
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c2f49c46ae0b07aae8ae558d5a5e71ed85aeff23
+refs/heads/snap-stage3: 439afaa329751b3dfd6735862cd2645705598909
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/fuzzer/cycles.rs

@@ -36,7 +36,7 @@ type pointy = {
     mut n : ~[mut maybe_pointy],
     mut o : {x : int, y : maybe_pointy}
 };
-// To add: objects; ifaces; anything type-parameterized?
+// To add: objects; traits; anything type-parameterized?
 
 fn empty_pointy() -> @pointy {
     ret @{

branches/snap-stage3/src/libcore/float.rs

@@ -525,7 +525,7 @@ fn test_to_str_inf() {
 }
 
 #[test]
-fn test_ifaces() {
+fn test_traits() {
     fn test<U:num::num>(ten: U) {
         assert (ten.to_int() == 10);
 

branches/snap-stage3/src/libcore/future.rs

@@ -158,7 +158,7 @@ fn test_from_fn() {
 }
 
 #[test]
-fn test_iface_get() {
+fn test_interface_get() {
     let f = from_value(~"fail");
     assert f.get() == ~"fail";
 }
@@ -170,7 +170,7 @@ fn test_with() {
 }
 
 #[test]
-fn test_iface_with() {
+fn test_interface_with() {
     let f = from_value(~"kale");
     assert f.with(|v| v) == ~"kale";
 }

branches/snap-stage3/src/libcore/hash.rs

@@ -79,7 +79,7 @@ pure fn hash_bytes_keyed(buf: &[const u8], k0: u64, k1: u64) -> u64 {
 }
 
 
-iface streaming {
+trait streaming {
     fn input(~[u8]);
     fn input_str(~str);
     fn result() -> ~[u8];

branches/snap-stage3/src/libcore/int-template.rs

@@ -230,7 +230,7 @@ fn test_to_str() {
 }
 
 #[test]
-fn test_ifaces() {
+fn test_interfaces() {
     fn test<U:num::num>(ten: U) {
         assert (ten.to_int() == 10);
 

branches/snap-stage3/src/libcore/io.rs

@@ -27,8 +27,8 @@ extern mod rustrt {
 enum seek_style { seek_set, seek_end, seek_cur, }
 
 
-// The raw underlying reader iface. All readers must implement this.
-iface reader {
+// The raw underlying reader trait. All readers must implement this.
+trait reader {
     // FIXME (#2004): Seekable really should be orthogonal.
 
     // FIXME (#2982): This should probably return an error.
@@ -250,7 +250,7 @@ fn FILE_reader(f: *libc::FILE, cleanup: bool) -> reader {
     }
 }
 
-// FIXME (#2004): this should either be an iface-less impl, a set of
+// FIXME (#2004): this should either be an trait-less impl, a set of
 // top-level functions that take a reader, or a set of default methods on
 // reader (which can then be called reader)
 
@@ -335,7 +335,7 @@ enum writer_type { screen, file }
 
 // FIXME (#2004): Seekable really should be orthogonal.
 // FIXME (#2004): eventually u64
-iface writer {
+trait writer {
     fn write(v: &[const u8]);
     fn seek(int, seek_style);
     fn tell() -> uint;
@@ -781,7 +781,7 @@ mod fsync {
     }
 
     // Type of objects that may want to fsync
-    iface t { fn fsync(l: level) -> int; }
+    trait t { fn fsync(l: level) -> int; }
 
     // Call o.fsync after executing blk
     fn obj_sync(&&o: t, opt_level: option<level>, blk: fn(&&res<t>)) {

branches/snap-stage3/src/libcore/iter.rs

@@ -1,4 +1,4 @@
-iface base_iter<A> {
+trait base_iter<A> {
     fn each(blk: fn(A) -> bool);
     fn size_hint() -> option<uint>;
 }
@@ -13,10 +13,10 @@ trait extended_iter<A> {
     fn position(f: fn(A) -> bool) -> option<uint>;
 }
 
-iface times {
+trait times {
     fn times(it: fn() -> bool);
 }
-iface timesi{
+trait timesi{
     fn timesi(it: fn(uint) -> bool);
 }
 

branches/snap-stage3/src/libcore/num.rs

@@ -2,7 +2,7 @@
 
 trait num {
     // FIXME: Cross-crate overloading doesn't work yet. (#2615)
-    // FIXME: Interface inheritance. (#2616)
+    // FIXME: Trait composition. (#2616)
     pure fn add(&&other: self) -> self;
     pure fn sub(&&other: self) -> self;
     pure fn mul(&&other: self) -> self;
@@ -12,6 +12,6 @@ trait num {
 
     pure fn to_int() -> int;
     pure fn from_int(n: int) -> self;    // FIXME (#2376) Static functions.
-    // n.b. #2376 is for classes, not ifaces, but it could be generalized...
+    // n.b. #2376 is for classes, not traits, but it could be generalized...
 }
 

branches/snap-stage3/src/libcore/rand.rs

@@ -15,7 +15,7 @@ extern mod rustrt {
 }
 
 /// A random number generator
-iface rng {
+trait rng {
     /// Return the next random integer
     fn next() -> u32;
 }

branches/snap-stage3/src/libcore/run.rs

@@ -19,7 +19,7 @@ extern mod rustrt {
 }
 
 /// A value representing a child process
-iface program {
+trait program {
     /// Returns the process id of the program
     fn get_id() -> pid_t;
 

branches/snap-stage3/src/libcore/task.rs

@@ -955,7 +955,7 @@ fn spawn_raw(opts: task_opts, +f: fn~()) {
  */
 type local_data_key<T: owned> = fn@(+@T);
 
-iface local_data { }
+trait local_data { }
 impl<T: owned> of local_data for @T { }
 
 // We use dvec because it's the best data structure in core. If TLS is used

branches/snap-stage3/src/libcore/to_bytes.rs

@@ -1,4 +1,4 @@
-iface to_bytes {
+trait to_bytes {
     fn to_bytes() -> ~[u8];
 }
 

branches/snap-stage3/src/libcore/to_str.rs

@@ -1,4 +1,4 @@
-iface to_str { fn to_str() -> ~str; }
+trait to_str { fn to_str() -> ~str; }
 
 impl of to_str for int {
     fn to_str() -> ~str { int::str(self) }

branches/snap-stage3/src/libstd/base64.rs

@@ -1,6 +1,6 @@
 import io::{reader, reader_util};
 
-iface to_base64 {
+trait to_base64 {
     fn to_base64() -> ~str;
 }
 
@@ -58,7 +58,7 @@ impl of to_base64 for ~str {
     }
 }
 
-iface from_base64 {
+trait from_base64 {
     fn from_base64() -> ~[u8];
 }
 

branches/snap-stage3/src/libstd/deque.rs

@@ -3,7 +3,7 @@
 import option::{some, none};
 import dvec::{dvec, extensions};
 
-iface t<T> {
+trait t<T> {
     fn size() -> uint;
     fn add_front(T);
     fn add_back(T);

branches/snap-stage3/src/libstd/json.rs

@@ -510,7 +510,7 @@ fn eq(value0: json, value1: json) -> bool {
     }
 }
 
-iface to_json { fn to_json() -> json; }
+trait to_json { fn to_json() -> json; }
 
 impl of to_json for json {
     fn to_json() -> json { self }

branches/snap-stage3/src/libstd/map.rs

@@ -24,7 +24,7 @@ type set<K> = hashmap<K, ()>;
 
 type hashmap<K, V> = chained::t<K, V>;
 
-iface map<K, V: copy> {
+trait map<K, V: copy> {
     /// Return the number of elements in the map
     fn size() -> uint;
 

branches/snap-stage3/src/libstd/net_tcp.rs

@@ -54,7 +54,7 @@ class tcp_socket {
  * A buffered wrapper for `net::tcp::tcp_socket`
  *
  * It is created with a call to `net::tcp::socket_buf()` and has impls that
- * satisfy both the `io::reader` and `io::writer` ifaces.
+ * satisfy both the `io::reader` and `io::writer` traits.
  */
 class tcp_socket_buf {
   let data: @tcp_buffered_socket_data;
@@ -764,7 +764,7 @@ impl tcp_socket for tcp_socket {
     }
 }
 
-/// Implementation of `io::reader` iface for a buffered `net::tcp::tcp_socket`
+/// Implementation of `io::reader` trait for a buffered `net::tcp::tcp_socket`
 impl tcp_socket_buf of io::reader for @tcp_socket_buf {
     fn read(buf: &[mut u8], len: uint) -> uint {
         // Loop until our buffer has enough data in it for us to read from.
@@ -817,7 +817,7 @@ impl tcp_socket_buf of io::reader for @tcp_socket_buf {
     }
 }
 
-/// Implementation of `io::reader` iface for a buffered `net::tcp::tcp_socket`
+/// Implementation of `io::reader` trait for a buffered `net::tcp::tcp_socket`
 impl tcp_socket_buf of io::writer for @tcp_socket_buf {
     fn write(data: &[const u8]) unsafe {
         let socket_data_ptr =
@@ -1083,11 +1083,11 @@ enum tcp_read_result {
     tcp_read_err(tcp_err_data)
 }
 
-iface to_tcp_err_iface {
+trait to_tcp_err {
     fn to_tcp_err() -> tcp_err_data;
 }
 
-impl of to_tcp_err_iface for uv::ll::uv_err_data {
+impl of to_tcp_err for uv::ll::uv_err_data {
     fn to_tcp_err() -> tcp_err_data {
         { err_name: self.err_name, err_msg: self.err_msg }
     }

branches/snap-stage3/src/libstd/serialization.rs

@@ -6,7 +6,7 @@ use core;
 Core serialization interfaces.
 */
 
-iface serializer {
+trait serializer {
     // Primitive types:
     fn emit_nil();
     fn emit_uint(v: uint);
@@ -39,7 +39,7 @@ iface serializer {
     fn emit_tup_elt(idx: uint, f: fn());
 }
 
-iface deserializer {
+trait deserializer {
     // Primitive types:
     fn read_nil() -> ();
 

branches/snap-stage3/src/libstd/sha1.rs

@@ -20,7 +20,7 @@
 export sha1;
 
 /// The SHA-1 interface
-iface sha1 {
+trait sha1 {
     /// Provide message input as bytes
     fn input(~[u8]);
     /// Provide message input as string

branches/snap-stage3/src/libsyntax/diagnostic.rs

@@ -13,7 +13,7 @@ type emitter = fn@(cmsp: option<(codemap::codemap, span)>,
                    msg: ~str, lvl: level);
 
 
-iface span_handler {
+trait span_handler {
     fn span_fatal(sp: span, msg: ~str) -> !;
     fn span_err(sp: span, msg: ~str);
     fn span_warn(sp: span, msg: ~str);
@@ -23,7 +23,7 @@ iface span_handler {
     fn handler() -> handler;
 }
 
-iface handler {
+trait handler {
     fn fatal(msg: ~str) -> !;
     fn err(msg: ~str);
     fn bump_err_count();

branches/snap-stage3/src/libsyntax/ext/base.rs

@@ -114,7 +114,7 @@ fn syntax_expander_table() -> hashmap<~str, syntax_extension> {
 // One of these is made during expansion and incrementally updated as we go;
 // when a macro expansion occurs, the resulting nodes have the backtrace()
 // -> expn_info of their expansion context stored into their span.
-iface ext_ctxt {
+trait ext_ctxt {
     fn codemap() -> codemap;
     fn parse_sess() -> parse::parse_sess;
     fn cfg() -> ast::crate_cfg;

branches/snap-stage3/src/libsyntax/ext/pipes/pipec.rs

@@ -383,7 +383,7 @@ impl compile of gen_init for protocol {
     }
 }
 
-iface to_source {
+trait to_source {
     // Takes a thing and generates a string containing rust code for it.
     fn to_source() -> ~str;
 }

branches/snap-stage3/src/libsyntax/ext/qquote.rs

@@ -22,7 +22,7 @@ enum fragment {
     from_ty(@ast::ty)
 }
 
-iface qq_helper {
+trait qq_helper {
     fn span() -> span;
     fn visit(aq_ctxt, vt<aq_ctxt>);
     fn extract_mac() -> option<ast::mac_>;

branches/snap-stage3/src/libsyntax/fold.rs

@@ -18,7 +18,7 @@ export fold_ty_params;
 export fold_fn_decl;
 export extensions;
 
-iface ast_fold {
+trait ast_fold {
     fn fold_crate(crate) -> crate;
     fn fold_crate_directive(&&@crate_directive) -> @crate_directive;
     fn fold_view_item(&&@view_item) -> @view_item;

branches/snap-stage3/src/libsyntax/parse/lexer.rs

@@ -9,7 +9,7 @@ export tt_reader,  new_tt_reader;
 export nextch, is_eof, bump, get_str_from, new_low_level_string_reader;
 export string_reader_as_reader, tt_reader_as_reader;
 
-iface reader {
+trait reader {
     fn is_eof() -> bool;
     fn next_token() -> {tok: token::token, sp: span};
     fn fatal(~str) -> !;

branches/snap-stage3/src/libsyntax/parse/parser.rs

@@ -2702,6 +2702,7 @@ class parser {
         } else if self.eat_keyword(~"enum") {
             self.parse_item_enum(vis)
         } else if self.eat_keyword(~"iface") {
+            self.warn(~"`iface` is deprecated; use `trait`");
             self.parse_item_trait()
         } else if self.eat_keyword(~"trait") {
             self.parse_item_trait()

branches/snap-stage3/src/libsyntax/print/pprust.rs

@@ -588,7 +588,7 @@ fn print_item(s: ps, &&item: @ast::item) {
         bclose(s, item.span);
       }
       ast::item_trait(tps, methods) {
-        head(s, ~"iface");
+        head(s, ~"trait");
         word(s.s, *item.ident);
         print_type_params(s, tps);
         word(s.s, ~" ");

branches/snap-stage3/src/libsyntax/util/interner.rs

@@ -19,7 +19,7 @@ fn mk<T: const copy>(hasher: hashfn<T>, eqer: eqfn<T>) -> interner<T> {
 }
 
 /* when traits can extend traits, we should extend index<uint,T> to get [] */
-iface interner<T: const copy> {
+trait interner<T: const copy> {
     fn intern(T) -> uint;
     pure fn get(uint) -> T;
     fn len() -> uint;

branches/snap-stage3/src/rt/rust_box_annihilator.cpp

@@ -120,7 +120,7 @@ class annihilator : public shape::data<annihilator,shape::ptr> {
         return;
     }
 
-    void walk_iface2() {
+    void walk_trait2() {
         walk_box2();
     }