Change remaining "iface" occurrences to "trait"; deprecate "iface"

56 files changed, 79 insertions, 74 deletions

diff --git a/src/test/auxiliary/cci_class_iface.rs b/src/test/auxiliary/cci_class_iface.rs
index 61f22d47290..94535f0a2c0 100644
--- a/src/test/auxiliary/cci_class_iface.rs
+++ b/src/test/auxiliary/cci_class_iface.rs
@@ -1,6 +1,6 @@
 mod animals {
 
-iface noisy {
+trait noisy {
   fn speak();
 }
 
diff --git a/src/test/auxiliary/issue-2380.rs b/src/test/auxiliary/issue-2380.rs
index b7f7004600e..6749998c612 100644
--- a/src/test/auxiliary/issue-2380.rs
+++ b/src/test/auxiliary/issue-2380.rs
@@ -1,7 +1,7 @@
 #[link(name = "a", vers = "0.0")];
 #[crate_type = "lib"];
 
-iface i<T> { }
+trait i<T> { }
 
 fn f<T>() -> i<T> {
     impl <T> of i<T> for () { }
diff --git a/src/test/auxiliary/issue_2242_a.rs b/src/test/auxiliary/issue_2242_a.rs
index e7947cf583a..54ae3cba785 100644
--- a/src/test/auxiliary/issue_2242_a.rs
+++ b/src/test/auxiliary/issue_2242_a.rs
@@ -1,7 +1,7 @@
 #[link(name = "a", vers = "0.1")];
 #[crate_type = "lib"];
 
-iface to_str {
+trait to_str {
     fn to_str() -> str;
 }
 
diff --git a/src/test/compile-fail/ambig_impl_bounds.rs b/src/test/compile-fail/ambig_impl_bounds.rs
index 9d7a9634a07..21399eab729 100644
--- a/src/test/compile-fail/ambig_impl_bounds.rs
+++ b/src/test/compile-fail/ambig_impl_bounds.rs
@@ -1,5 +1,5 @@
-iface A { fn foo(); }
-iface B { fn foo(); }
+trait A { fn foo(); }
+trait B { fn foo(); }
 
 fn foo<T: A B>(t: T) {
     t.foo(); //~ ERROR multiple applicable methods in scope
diff --git a/src/test/compile-fail/class-cast-to-iface.rs b/src/test/compile-fail/class-cast-to-iface.rs
index 72e215688fd..fb35b788779 100644
--- a/src/test/compile-fail/class-cast-to-iface.rs
+++ b/src/test/compile-fail/class-cast-to-iface.rs
@@ -1,5 +1,5 @@
 // error-pattern: attempted access of field `eat` on type `noisy`
-iface noisy {
+trait noisy {
   fn speak();
 }
 
diff --git a/src/test/compile-fail/class-method-missing.rs b/src/test/compile-fail/class-method-missing.rs
index 788baa73c34..b49fa62577d 100644
--- a/src/test/compile-fail/class-method-missing.rs
+++ b/src/test/compile-fail/class-method-missing.rs
@@ -1,5 +1,5 @@
 // error-pattern:missing method `eat`
-iface animal {
+trait animal {
   fn eat();
 }
 
diff --git a/src/test/compile-fail/iface-cast.rs b/src/test/compile-fail/iface-cast.rs
index a82bb0b80d2..f6642ec1b62 100644
--- a/src/test/compile-fail/iface-cast.rs
+++ b/src/test/compile-fail/iface-cast.rs
@@ -1,4 +1,4 @@
-iface foo<T> { }
+trait foo<T> { }
 
 fn bar(x: foo<uint>) -> foo<int> {
     ret (x as foo::<int>);
diff --git a/src/test/compile-fail/iface-impl-different-num-params.rs b/src/test/compile-fail/iface-impl-different-num-params.rs
index 9c51f56e54c..0ac42fe52eb 100644
--- a/src/test/compile-fail/iface-impl-different-num-params.rs
+++ b/src/test/compile-fail/iface-impl-different-num-params.rs
@@ -1,4 +1,4 @@
-iface foo {
+trait foo {
     fn bar(x: uint) -> self;
 }
 impl of foo for int {
diff --git a/src/test/compile-fail/iface-keyword.rs b/src/test/compile-fail/iface-keyword.rs
new file mode 100644
index 00000000000..a2ae5a42849
--- /dev/null
+++ b/src/test/compile-fail/iface-keyword.rs
@@ -0,0 +1,5 @@
+iface foo { } //~ WARN `iface` is deprecated; use `trait`
+
+fn main() { 
+    x //~ ERROR unresolved name: x
+}
\ No newline at end of file
diff --git a/src/test/compile-fail/iface-test-2.rs b/src/test/compile-fail/iface-test-2.rs
index dc1b9501df0..b53f1972b72 100644
--- a/src/test/compile-fail/iface-test-2.rs
+++ b/src/test/compile-fail/iface-test-2.rs
@@ -1,4 +1,4 @@
-iface bar { fn dup() -> self; fn blah<X>(); }
+trait bar { fn dup() -> self; fn blah<X>(); }
 impl of bar for int { fn dup() -> int { self } fn blah<X>() {} }
 impl of bar for uint { fn dup() -> uint { self } fn blah<X>() {} }
 
diff --git a/src/test/compile-fail/iface-test.rs b/src/test/compile-fail/iface-test.rs
index 1523c4d9b96..3084c0f4e57 100644
--- a/src/test/compile-fail/iface-test.rs
+++ b/src/test/compile-fail/iface-test.rs
@@ -1,4 +1,4 @@
-iface foo { fn foo(); }
+trait foo { fn foo(); }
 
 impl of int for uint { fn foo() {} } //~ ERROR trait
 
diff --git a/src/test/compile-fail/infinite-instantiation.rs b/src/test/compile-fail/infinite-instantiation.rs
index fa49f605306..7d019461b48 100644
--- a/src/test/compile-fail/infinite-instantiation.rs
+++ b/src/test/compile-fail/infinite-instantiation.rs
@@ -1,7 +1,7 @@
 // error-pattern: overly deep expansion
 // issue 2258
 
-iface to_opt {
+trait to_opt {
     fn to_option() -> option<self>;
 }
 
diff --git a/src/test/compile-fail/issue-2330.rs b/src/test/compile-fail/issue-2330.rs
index 9bbba8f5caf..8ae1cdbe18a 100644
--- a/src/test/compile-fail/issue-2330.rs
+++ b/src/test/compile-fail/issue-2330.rs
@@ -1,6 +1,6 @@
 enum chan { }
 
-iface channel<T> {
+trait channel<T> {
     fn send(v: T);
 }
 
diff --git a/src/test/compile-fail/issue-3021-d.rs b/src/test/compile-fail/issue-3021-d.rs
index 85a8fb8a091..145cce00839 100644
--- a/src/test/compile-fail/issue-3021-d.rs
+++ b/src/test/compile-fail/issue-3021-d.rs
@@ -1,6 +1,6 @@
 use std;
 
-iface siphash {
+trait siphash {
     fn result() -> u64;
     fn reset();
 }
diff --git a/src/test/compile-fail/issue-3021.rs b/src/test/compile-fail/issue-3021.rs
index 5895f8413ea..89fe96b7302 100644
--- a/src/test/compile-fail/issue-3021.rs
+++ b/src/test/compile-fail/issue-3021.rs
@@ -1,6 +1,6 @@
 use std;
 
-iface siphash {
+trait siphash {
     fn reset();
 }
 
diff --git a/src/test/compile-fail/kindck-owned-trait-contains.rs b/src/test/compile-fail/kindck-owned-trait-contains.rs
index 8383a500e80..00d5f8e9901 100644
--- a/src/test/compile-fail/kindck-owned-trait-contains.rs
+++ b/src/test/compile-fail/kindck-owned-trait-contains.rs
@@ -1,11 +1,11 @@
-iface repeat<A> { fn get() -> A; }
+trait repeat<A> { fn get() -> A; }
 
 impl<A:copy> of repeat<A> for @A {
     fn get() -> A { *self }
 }
 
 fn repeater<A:copy>(v: @A) -> repeat<A> {
-    // Note: owned kind is not necessary as A appears in the iface type
+    // Note: owned kind is not necessary as A appears in the trait type
     v as repeat::<A> // No
 }
 
diff --git a/src/test/compile-fail/kindck-owned-trait-scoped.rs b/src/test/compile-fail/kindck-owned-trait-scoped.rs
index 26570868c5f..888e75a4f32 100644
--- a/src/test/compile-fail/kindck-owned-trait-scoped.rs
+++ b/src/test/compile-fail/kindck-owned-trait-scoped.rs
@@ -1,7 +1,7 @@
-// A dummy iface/impl that work close over any type.  The iface will
+// A dummy trait/impl that work close over any type.  The trait will
 // be parameterized by a region due to the &self/int constraint.
 
-iface foo {
+trait foo {
     fn foo(i: &self/int) -> int;
 }
 
diff --git a/src/test/compile-fail/kindck-owned-trait.rs b/src/test/compile-fail/kindck-owned-trait.rs
index e1cebb46c47..35009847c73 100644
--- a/src/test/compile-fail/kindck-owned-trait.rs
+++ b/src/test/compile-fail/kindck-owned-trait.rs
@@ -1,4 +1,4 @@
-iface foo { fn foo(); }
+trait foo { fn foo(); }
 
 fn to_foo<T: copy foo>(t: T) -> foo {
     t as foo //~ ERROR value may contain borrowed pointers; use `owned` bound
diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs
index 4b3649e30e8..0a506367341 100644
--- a/src/test/compile-fail/map-types.rs
+++ b/src/test/compile-fail/map-types.rs
@@ -3,7 +3,7 @@ import std::map;
 import std::map::hashmap;
 import std::map::map;
 
-// Test that iface types printed in error msgs include the type arguments.
+// Test that trait types printed in error msgs include the type arguments.
 
 fn main() {
     let x: map<~str,~str> = map::str_hash::<~str>() as map::<~str,~str>;
diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs
index 43a3536ed16..a1211e1b09f 100644
--- a/src/test/compile-fail/qquote-1.rs
+++ b/src/test/compile-fail/qquote-1.rs
@@ -15,7 +15,7 @@ fn new_parse_sess() -> parse::parse_sess {
   fail;
 }
 
-iface fake_ext_ctxt {
+trait fake_ext_ctxt {
     fn session() -> fake_session;
 }
 
diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs
index 80b42622ffd..6469e046229 100644
--- a/src/test/compile-fail/qquote-2.rs
+++ b/src/test/compile-fail/qquote-2.rs
@@ -15,7 +15,7 @@ fn new_parse_sess() -> parser::parse_sess {
   fail;
 }
 
-iface fake_ext_ctxt {
+trait fake_ext_ctxt {
     fn session() -> fake_session;
 }
 
diff --git a/src/test/compile-fail/regions-bounds.rs b/src/test/compile-fail/regions-bounds.rs
index 59e8af556de..e62b702e53f 100644
--- a/src/test/compile-fail/regions-bounds.rs
+++ b/src/test/compile-fail/regions-bounds.rs
@@ -3,15 +3,15 @@
 // checked.
 
 enum an_enum = &int;
-iface an_iface { fn foo() -> &self/int; }
+trait a_trait { fn foo() -> &self/int; }
 class a_class { let x:&self/int; new(x:&self/int) { self.x = x; } }
 
 fn a_fn1(e: an_enum/&a) -> an_enum/&b {
     ret e; //~ ERROR mismatched types: expected `an_enum/&b` but found `an_enum/&a`
 }
 
-fn a_fn2(e: an_iface/&a) -> an_iface/&b {
-    ret e; //~ ERROR mismatched types: expected `an_iface/&b` but found `an_iface/&a`
+fn a_fn2(e: a_trait/&a) -> a_trait/&b {
+    ret e; //~ ERROR mismatched types: expected `a_trait/&b` but found `a_trait/&a`
 }
 
 fn a_fn3(e: a_class/&a) -> a_class/&b {
diff --git a/src/test/compile-fail/regions-escape-via-iface-or-not.rs b/src/test/compile-fail/regions-escape-via-iface-or-not.rs
index 297b183a1b4..ef5f3463e8e 100644
--- a/src/test/compile-fail/regions-escape-via-iface-or-not.rs
+++ b/src/test/compile-fail/regions-escape-via-iface-or-not.rs
@@ -1,4 +1,4 @@
-iface deref {
+trait deref {
     fn get() -> int;
 }
 
diff --git a/src/test/compile-fail/regions-iface-1.rs b/src/test/compile-fail/regions-iface-1.rs
index 230bf150a1c..71081ac37fb 100644
--- a/src/test/compile-fail/regions-iface-1.rs
+++ b/src/test/compile-fail/regions-iface-1.rs
@@ -1,6 +1,6 @@
 type ctxt = { v: uint };
 
-iface get_ctxt {
+trait get_ctxt {
     // Here the `&` is bound in the method definition:
     fn get_ctxt() -> &ctxt;
 }
diff --git a/src/test/compile-fail/regions-iface-2.rs b/src/test/compile-fail/regions-iface-2.rs
index 7ea17cea45a..c034f8a753a 100644
--- a/src/test/compile-fail/regions-iface-2.rs
+++ b/src/test/compile-fail/regions-iface-2.rs
@@ -1,6 +1,6 @@
 type ctxt = { v: uint };
 
-iface get_ctxt {
+trait get_ctxt {
     fn get_ctxt() -> &self/ctxt;
 }
 
diff --git a/src/test/compile-fail/regions-iface-3.rs b/src/test/compile-fail/regions-iface-3.rs
index ff6d7b42a53..78e77d66def 100644
--- a/src/test/compile-fail/regions-iface-3.rs
+++ b/src/test/compile-fail/regions-iface-3.rs
@@ -1,4 +1,4 @@
-iface get_ctxt {
+trait get_ctxt {
     fn get_ctxt() -> &self/uint;
 }
 
diff --git a/src/test/compile-fail/regions-infer-paramd-method.rs b/src/test/compile-fail/regions-infer-paramd-method.rs
index 33c699c0c86..ea62d72cd66 100644
--- a/src/test/compile-fail/regions-infer-paramd-method.rs
+++ b/src/test/compile-fail/regions-infer-paramd-method.rs
@@ -1,7 +1,7 @@
 // Here: foo is parameterized because it contains a method that
 // refers to self.
 
-iface foo {
+trait foo {
     fn self_int() -> &self/int;
 
     fn any_int() -> &int;
@@ -21,7 +21,7 @@ impl methods of set_foo_foo for with_foo {
 
 // Bar is not region parameterized.
 
-iface bar {
+trait bar {
     fn any_int() -> &int;
 }
 
diff --git a/src/test/compile-fail/selftype-astparam.rs b/src/test/compile-fail/selftype-astparam.rs
index 64699267c4d..25dd29300e5 100644
--- a/src/test/compile-fail/selftype-astparam.rs
+++ b/src/test/compile-fail/selftype-astparam.rs
@@ -1,4 +1,4 @@
-iface add {
+trait add {
     fn plus(++x: self) -> self;
 }
 
diff --git a/src/test/compile-fail/selftype-ifacetype.rs b/src/test/compile-fail/selftype-ifacetype.rs
index c4ba8093886..09fc12fda1e 100644
--- a/src/test/compile-fail/selftype-ifacetype.rs
+++ b/src/test/compile-fail/selftype-ifacetype.rs
@@ -1,4 +1,4 @@
-iface add {
+trait add {
     fn plus(x: self) -> self;
 }
 
diff --git a/src/test/compile-fail/seq-args.rs b/src/test/compile-fail/seq-args.rs
index db2cb9b7a17..4d9eadf65ed 100644
--- a/src/test/compile-fail/seq-args.rs
+++ b/src/test/compile-fail/seq-args.rs
@@ -1,6 +1,6 @@
 use std;
 fn main() {
-iface seq { }
+trait seq { }
 
 impl <T> of seq<T> for ~[T] { //~ ERROR wrong number of type arguments
     /* ... */
diff --git a/src/test/compile-fail/tps-invariant-iface.rs b/src/test/compile-fail/tps-invariant-iface.rs
index 81caef856c2..82fbd5f1163 100644
--- a/src/test/compile-fail/tps-invariant-iface.rs
+++ b/src/test/compile-fail/tps-invariant-iface.rs
@@ -1,4 +1,4 @@
-iface box_iface<T> {
+trait box_trait<T> {
     fn get() -> T;
     fn set(t: T);
 }
@@ -7,12 +7,12 @@ enum box_impl<T> = {
     mut f: T
 };
 
-impl<T:copy> of box_iface<T> for box_impl<T> {
+impl<T:copy> of box_trait<T> for box_impl<T> {
     fn get() -> T { ret self.f; }
     fn set(t: T) { self.f = t; }
 }
 
-fn set_box_iface<T>(b: box_iface<@const T>, v: @const T) {
+fn set_box_trait<T>(b: box_trait<@const T>, v: @const T) {
     b.set(v);
 }
 
@@ -22,7 +22,7 @@ fn set_box_impl<T>(b: box_impl<@const T>, v: @const T) {
 
 fn main() {
     let b = box_impl::<@int>({mut f: @3});
-    set_box_iface(b as box_iface::<@int>, @mut 5);
+    set_box_trait(b as box_trait::<@int>, @mut 5);
     //~^ ERROR values differ in mutability
     set_box_impl(b, @mut 5);
     //~^ ERROR values differ in mutability
diff --git a/src/test/run-fail/unwind-box-iface.rs b/src/test/run-fail/unwind-box-iface.rs
index b9c674bd008..f56cc13273b 100644
--- a/src/test/run-fail/unwind-box-iface.rs
+++ b/src/test/run-fail/unwind-box-iface.rs
@@ -4,7 +4,7 @@ fn failfn() {
     fail;
 }
 
-iface i {
+trait i {
     fn foo();
 }
 
diff --git a/src/test/run-pass-fulldeps/issue-1926.rs b/src/test/run-pass-fulldeps/issue-1926.rs
index f4dbf24f005..5a19fb96464 100644
--- a/src/test/run-pass-fulldeps/issue-1926.rs
+++ b/src/test/run-pass-fulldeps/issue-1926.rs
@@ -21,7 +21,7 @@ fn new_parse_sess() -> parser::parse_sess {
     ret sess;
 }
 
-iface fake_ext_ctxt {
+trait fake_ext_ctxt {
     fn session() -> fake_session;
     fn cfg() -> ast::crate_cfg;
     fn parse_sess() -> parser::parse_sess;
diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs
index 173884d1d66..bdf1cb63f99 100644
--- a/src/test/run-pass-fulldeps/qquote.rs
+++ b/src/test/run-pass-fulldeps/qquote.rs
@@ -11,7 +11,7 @@ import syntax::codemap;
 import syntax::parse;
 import syntax::print::*;
 
-iface fake_ext_ctxt {
+trait fake_ext_ctxt {
     fn cfg() -> ast::crate_cfg;
     fn parse_sess() -> parse::parse_sess;
 }
diff --git a/src/test/run-pass/assignability-iface.rs b/src/test/run-pass/assignability-iface.rs
index b0d0f3074d0..f555f61f5b8 100644
--- a/src/test/run-pass/assignability-iface.rs
+++ b/src/test/run-pass/assignability-iface.rs
@@ -2,7 +2,7 @@
 // making method calls, but only if there aren't any matches without
 // it.
 
-iface iterable<A> {
+trait iterable<A> {
     fn iterate(blk: fn(A) -> bool);
 }
 
diff --git a/src/test/run-pass/class-cast-to-iface-multiple-types.rs b/src/test/run-pass/class-cast-to-iface-multiple-types.rs
index a55ef9f8bd7..d28c60dd291 100644
--- a/src/test/run-pass/class-cast-to-iface-multiple-types.rs
+++ b/src/test/run-pass/class-cast-to-iface-multiple-types.rs
@@ -1,4 +1,4 @@
-iface noisy {
+trait noisy {
   fn speak() -> int;
 }
 
diff --git a/src/test/run-pass/class-cast-to-iface.rs b/src/test/run-pass/class-cast-to-iface.rs
index bba7540d22b..0fba6a7b74b 100644
--- a/src/test/run-pass/class-cast-to-iface.rs
+++ b/src/test/run-pass/class-cast-to-iface.rs
@@ -1,4 +1,4 @@
-iface noisy {
+trait noisy {
   fn speak();
 }
 
diff --git a/src/test/run-pass/class-impl-very-parameterized-iface.rs b/src/test/run-pass/class-impl-very-parameterized-iface.rs
index 4126df0f5b7..2a5bcc98f06 100644
--- a/src/test/run-pass/class-impl-very-parameterized-iface.rs
+++ b/src/test/run-pass/class-impl-very-parameterized-iface.rs
@@ -6,7 +6,7 @@ enum cat_type { tuxedo, tabby, tortoiseshell }
 // Very silly -- this just returns the value of the name field
 // for any int value that's less than the meows field
 
-// ok: T should be in scope when resolving the iface ref for map
+// ok: T should be in scope when resolving the trait ref for map
 class cat<T: copy> : map<int, T> {
   priv {
     // Yes, you can have negative meows
diff --git a/src/test/run-pass/class-implement-ifaces.rs b/src/test/run-pass/class-implement-ifaces.rs
index eedc308a460..73a2e685af1 100644
--- a/src/test/run-pass/class-implement-ifaces.rs
+++ b/src/test/run-pass/class-implement-ifaces.rs
@@ -1,4 +1,4 @@
-iface noisy {
+trait noisy {
   fn speak();
 }
 
diff --git a/src/test/run-pass/class-implements-multiple-ifaces.rs b/src/test/run-pass/class-implements-multiple-ifaces.rs
index b8fd1dd2f27..968dfb07bf9 100644
--- a/src/test/run-pass/class-implements-multiple-ifaces.rs
+++ b/src/test/run-pass/class-implements-multiple-ifaces.rs
@@ -8,15 +8,15 @@ import dvec::{dvec, extensions};
 enum furniture { chair, couch, bed }
 enum body_part { finger, toe, nose, ear }
 
-iface noisy {
+trait noisy {
   fn speak() -> int;
 }
 
-iface scratchy {
+trait scratchy {
   fn scratch() -> option<furniture>;
 }
 
-iface bitey {
+trait bitey {
   fn bite() -> body_part;
 }
 
diff --git a/src/test/run-pass/iface-cast.rs b/src/test/run-pass/iface-cast.rs
index ce1147dd176..919c53d32b2 100644
--- a/src/test/run-pass/iface-cast.rs
+++ b/src/test/run-pass/iface-cast.rs
@@ -1,4 +1,4 @@
-// Test cyclic detector when using iface instances.
+// Test cyclic detector when using trait instances.
 
 enum Tree = TreeR;
 type TreeR = @{
@@ -7,7 +7,7 @@ type TreeR = @{
     val: to_str
 };
 
-iface to_str {
+trait to_str {
     fn to_str() -> ~str;
 }
 
diff --git a/src/test/run-pass/iface-generic.rs b/src/test/run-pass/iface-generic.rs
index f60dd6e1f18..d6b1aa4ee1f 100644
--- a/src/test/run-pass/iface-generic.rs
+++ b/src/test/run-pass/iface-generic.rs
@@ -1,4 +1,4 @@
-iface to_str {
+trait to_str {
     fn to_str() -> ~str;
 }
 impl of to_str for int {
@@ -11,7 +11,7 @@ impl of to_str for () {
     fn to_str() -> ~str { ~"()" }
 }
 
-iface map<T> {
+trait map<T> {
     fn map<U>(f: fn(T) -> U) -> ~[U];
 }
 impl <T> of map<T> for ~[T] {
diff --git a/src/test/run-pass/iface-to-str.rs b/src/test/run-pass/iface-to-str.rs
index 71d25b4efd5..29d17cc7c7d 100644
--- a/src/test/run-pass/iface-to-str.rs
+++ b/src/test/run-pass/iface-to-str.rs
@@ -1,4 +1,4 @@
-iface to_str {
+trait to_str {
     fn to_str() -> ~str;
 }
 
diff --git a/src/test/run-pass/issue-2185.rs b/src/test/run-pass/issue-2185.rs
index 104ea37588b..67f90d6e3d6 100644
--- a/src/test/run-pass/issue-2185.rs
+++ b/src/test/run-pass/issue-2185.rs
@@ -1,8 +1,8 @@
-// This test had to do with an outdated version of the iterable iface.
+// This test had to do with an outdated version of the iterable trait.
 // However, the condition it was testing seemed complex enough to
 // warrant still having a test, so I inlined the old definitions.
 
-iface iterable<A> {
+trait iterable<A> {
     fn iter(blk: fn(A));
 }
 
diff --git a/src/test/run-pass/issue-2288.rs b/src/test/run-pass/issue-2288.rs
index e2db655ca5d..559edf37956 100644
--- a/src/test/run-pass/issue-2288.rs
+++ b/src/test/run-pass/issue-2288.rs
@@ -1,4 +1,4 @@
-iface clam<A: copy> {
+trait clam<A: copy> {
   fn chowder(y: A);
 }
 class foo<A: copy> : clam<A> {
diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs
index d9a68bcf7a0..328b6b3b4c3 100644
--- a/src/test/run-pass/issue-2311-2.rs
+++ b/src/test/run-pass/issue-2311-2.rs
@@ -1,4 +1,4 @@
-iface clam<A: copy> { }
+trait clam<A: copy> { }
 class foo<A: copy> {
   let x: A;
   new(b: A) { self.x = b; }
diff --git a/src/test/run-pass/issue-2311.rs b/src/test/run-pass/issue-2311.rs
index f46228e9846..267fd08d123 100644
--- a/src/test/run-pass/issue-2311.rs
+++ b/src/test/run-pass/issue-2311.rs
@@ -1,5 +1,5 @@
-iface clam<A> { }
-iface foo<A> {
+trait clam<A> { }
+trait foo<A> {
    fn bar<B,C:clam<A>>(c: C) -> B;
 }
 
diff --git a/src/test/run-pass/issue-2734.rs b/src/test/run-pass/issue-2734.rs
index 9c655c5954a..d466265cf7a 100644
--- a/src/test/run-pass/issue-2734.rs
+++ b/src/test/run-pass/issue-2734.rs
@@ -1,4 +1,4 @@
-iface hax { } 
+trait hax { } 
 impl <A> of hax for A { } 
 
 fn perform_hax<T: owned>(x: @T) -> hax {
diff --git a/src/test/run-pass/issue-2735.rs b/src/test/run-pass/issue-2735.rs
index 2ff4aa77856..7a5479ac3fa 100644
--- a/src/test/run-pass/issue-2735.rs
+++ b/src/test/run-pass/issue-2735.rs
@@ -1,4 +1,4 @@
-iface hax { } 
+trait hax { } 
 impl <A> of hax for A { } 
 
 fn perform_hax<T: owned>(x: @T) -> hax {
diff --git a/src/test/run-pass/kindck-owned-trait-contains-1.rs b/src/test/run-pass/kindck-owned-trait-contains-1.rs
index 4b7f01e39de..e69714e5aa7 100644
--- a/src/test/run-pass/kindck-owned-trait-contains-1.rs
+++ b/src/test/run-pass/kindck-owned-trait-contains-1.rs
@@ -1,11 +1,11 @@
-iface repeat<A> { fn get() -> A; }
+trait repeat<A> { fn get() -> A; }
 
 impl<A:copy> of repeat<A> for @A {
     fn get() -> A { *self }
 }
 
 fn repeater<A:copy>(v: @A) -> repeat<A> {
-    // Note: owned kind is not necessary as A appears in the iface type
+    // Note: owned kind is not necessary as A appears in the trait type
     v as repeat::<A> // No
 }
 
diff --git a/src/test/run-pass/method-attributes.rs b/src/test/run-pass/method-attributes.rs
index 0b711682b0a..b48d3887379 100644
--- a/src/test/run-pass/method-attributes.rs
+++ b/src/test/run-pass/method-attributes.rs
@@ -1,7 +1,7 @@
 // pp-exact - Make sure we print all the attributes
 
 #[frobable]
-iface frobable {
+trait frobable {
     #[frob_attr]
     fn frob();
     #[defrob_attr]
diff --git a/src/test/run-pass/monomorphize-iface-in-fn-at.rs b/src/test/run-pass/monomorphize-iface-in-fn-at.rs
index 3530426de70..bc782d44416 100644
--- a/src/test/run-pass/monomorphize-iface-in-fn-at.rs
+++ b/src/test/run-pass/monomorphize-iface-in-fn-at.rs
@@ -6,7 +6,7 @@ fn mk_nil<C:ty_ops>(cx: C) -> uint {
     cx.mk()
 }
 
-iface ty_ops {
+trait ty_ops {
     fn mk() -> uint;
 }
 
diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs
index 356be35b1f8..2e38cc4b348 100644
--- a/src/test/run-pass/reflect-visit-data.rs
+++ b/src/test/run-pass/reflect-visit-data.rs
@@ -11,8 +11,8 @@ type unboxed_vec_repr = {
 
 #[doc = "High-level interfaces to `intrinsic::visit_ty` reflection system."]
 
-/// Iface for visitor that wishes to reflect on data.
-iface movable_ptr {
+/// Trait for visitor that wishes to reflect on data.
+trait movable_ptr {
     fn move_ptr(adjustment: fn(*c_void) -> *c_void);
 }
 
diff --git a/src/test/run-pass/regions-iface.rs b/src/test/run-pass/regions-iface.rs
index 619d2cdeaeb..1d264b706ed 100644
--- a/src/test/run-pass/regions-iface.rs
+++ b/src/test/run-pass/regions-iface.rs
@@ -1,6 +1,6 @@
 type ctxt = { v: uint };
 
-iface get_ctxt {
+trait get_ctxt {
     fn get_ctxt() -> &self/ctxt;
 }
 
diff --git a/src/test/run-pass/traits.rs b/src/test/run-pass/traits.rs
index c50d9bf96ac..8b1ea84ba0d 100644
--- a/src/test/run-pass/traits.rs
+++ b/src/test/run-pass/traits.rs
@@ -8,7 +8,7 @@ trait Eq {
     fn eq(a: self) -> bool;
 
     fn neq(a: self) -> bool {
-        !self.neq(a)
+        !self.eq(a)
     }
 }
 
@@ -34,12 +34,12 @@ trait Ord < Eq {
 
 // pronounced "impl of Ord for int" -- not sold on this yet
 impl int: Ord {
-    fn lt(a: self) -> bool {
+    fn lt(a: int) -> bool {
         self < a
     }
 
     // is this the place to put this?
-    fn eq(a: self) -> bool {
+    fn eq(a: int) -> bool {
         self == a
     }
 }
diff --git a/src/test/run-pass/use-iface-before-def.rs b/src/test/run-pass/use-iface-before-def.rs
index aa981e2fb4b..6687c61ce45 100644
--- a/src/test/run-pass/use-iface-before-def.rs
+++ b/src/test/run-pass/use-iface-before-def.rs
@@ -1,5 +1,5 @@
 // Issue #1761
 
 impl of foo for int { fn foo() -> int { 10 } }
-iface foo { fn foo() -> int; }
+trait foo { fn foo() -> int; }
 fn main() {}
\ No newline at end of file