rust-lang
diff --git a/‎[refs]
Lines changed: 1 addition & 1 deletion b/‎[refs]
Lines changed: 1 addition & 1 deletion
diff --git a/‎trunk/src/test/auxiliary/cci_class_iface.rs renamed to ‎trunk/src/test/auxiliary/cci_class_trait.rs b/‎trunk/src/test/auxiliary/cci_class_iface.rs renamed to ‎trunk/src/test/auxiliary/cci_class_trait.rs
diff --git a/‎trunk/src/test/compile-fail/class-cast-to-iface.rs renamed to ‎trunk/src/test/compile-fail/class-cast-to-trait.rs b/‎trunk/src/test/compile-fail/class-cast-to-iface.rs renamed to ‎trunk/src/test/compile-fail/class-cast-to-trait.rs
diff --git a/‎trunk/src/test/compile-fail/class-implements-bad-iface.rs renamed to ‎trunk/src/test/compile-fail/class-implements-bad-trait.rs b/‎trunk/src/test/compile-fail/class-implements-bad-iface.rs renamed to ‎trunk/src/test/compile-fail/class-implements-bad-trait.rs
diff --git a/‎trunk/src/test/compile-fail/regions-escape-via-iface-or-not.rs renamed to ‎trunk/src/test/compile-fail/regions-escape-via-trait-or-not.rs b/‎trunk/src/test/compile-fail/regions-escape-via-iface-or-not.rs renamed to ‎trunk/src/test/compile-fail/regions-escape-via-trait-or-not.rs
diff --git a/‎trunk/src/test/compile-fail/regions-iface-1.rs renamed to ‎trunk/src/test/compile-fail/regions-trait-1.rs b/‎trunk/src/test/compile-fail/regions-iface-1.rs renamed to ‎trunk/src/test/compile-fail/regions-trait-1.rs
diff --git a/‎trunk/src/test/compile-fail/regions-iface-2.rs renamed to ‎trunk/src/test/compile-fail/regions-trait-2.rs b/‎trunk/src/test/compile-fail/regions-iface-2.rs renamed to ‎trunk/src/test/compile-fail/regions-trait-2.rs
diff --git a/‎trunk/src/test/compile-fail/regions-iface-3.rs renamed to ‎trunk/src/test/compile-fail/regions-trait-3.rs b/‎trunk/src/test/compile-fail/regions-iface-3.rs renamed to ‎trunk/src/test/compile-fail/regions-trait-3.rs
diff --git a/‎trunk/src/test/compile-fail/selftype-ifacetype.rs renamed to ‎trunk/src/test/compile-fail/selftype-traittype.rs b/‎trunk/src/test/compile-fail/selftype-ifacetype.rs renamed to ‎trunk/src/test/compile-fail/selftype-traittype.rs
diff --git a/‎trunk/src/test/compile-fail/tps-invariant-iface.rs renamed to ‎trunk/src/test/compile-fail/tps-invariant-trait.rs b/‎trunk/src/test/compile-fail/tps-invariant-iface.rs renamed to ‎trunk/src/test/compile-fail/tps-invariant-trait.rs
diff --git a/‎trunk/src/test/compile-fail/iface-cast.rs renamed to ‎trunk/src/test/compile-fail/trait-cast.rs b/‎trunk/src/test/compile-fail/iface-cast.rs renamed to ‎trunk/src/test/compile-fail/trait-cast.rs
diff --git a/‎trunk/src/test/compile-fail/iface-impl-different-num-params.rs renamed to ‎trunk/src/test/compile-fail/trait-impl-different-num-params.rs b/‎trunk/src/test/compile-fail/iface-impl-different-num-params.rs renamed to ‎trunk/src/test/compile-fail/trait-impl-different-num-params.rs
diff --git a/‎trunk/src/test/compile-fail/iface-keyword.rs renamed to ‎trunk/src/test/compile-fail/trait-keyword.rs b/‎trunk/src/test/compile-fail/iface-keyword.rs renamed to ‎trunk/src/test/compile-fail/trait-keyword.rs
diff --git a/‎trunk/src/test/compile-fail/iface-test-2.rs renamed to ‎trunk/src/test/compile-fail/trait-test-2.rs b/‎trunk/src/test/compile-fail/iface-test-2.rs renamed to ‎trunk/src/test/compile-fail/trait-test-2.rs
diff --git a/‎trunk/src/test/compile-fail/iface-test.rs renamed to ‎trunk/src/test/compile-fail/trait-test.rs b/‎trunk/src/test/compile-fail/iface-test.rs renamed to ‎trunk/src/test/compile-fail/trait-test.rs
diff --git a/‎trunk/src/test/run-fail/unwind-box-iface.rs renamed to ‎trunk/src/test/run-fail/unwind-box-trait.rs b/‎trunk/src/test/run-fail/unwind-box-iface.rs renamed to ‎trunk/src/test/run-fail/unwind-box-trait.rs
diff --git a/‎trunk/src/test/run-pass/assignability-iface.rs renamed to ‎trunk/src/test/run-pass/assignability-trait.rs b/‎trunk/src/test/run-pass/assignability-iface.rs renamed to ‎trunk/src/test/run-pass/assignability-trait.rs
diff --git a/‎trunk/src/test/run-pass/class-cast-to-iface-cross-crate-2.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/‎trunk/src/test/run-pass/class-cast-to-iface-cross-crate-2.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs
diff --git a/‎trunk/src/test/run-pass/class-cast-to-iface-cross-crate.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait-cross-crate.rs b/‎trunk/src/test/run-pass/class-cast-to-iface-cross-crate.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait-cross-crate.rs
diff --git a/‎trunk/src/test/run-pass/class-cast-to-iface-multiple-types.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/‎trunk/src/test/run-pass/class-cast-to-iface-multiple-types.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait-multiple-types.rs
diff --git a/‎trunk/src/test/run-pass/class-cast-to-iface.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait.rs b/‎trunk/src/test/run-pass/class-cast-to-iface.rs renamed to ‎trunk/src/test/run-pass/class-cast-to-trait.rs
diff --git a/‎trunk/src/test/run-pass/class-impl-parameterized-iface.rs renamed to ‎trunk/src/test/run-pass/class-impl-parameterized-trait.rs b/‎trunk/src/test/run-pass/class-impl-parameterized-iface.rs renamed to ‎trunk/src/test/run-pass/class-impl-parameterized-trait.rs
diff --git a/‎trunk/src/test/run-pass/class-impl-very-parameterized-iface.rs renamed to ‎trunk/src/test/run-pass/class-impl-very-parameterized-trait.rs b/‎trunk/src/test/run-pass/class-impl-very-parameterized-iface.rs renamed to ‎trunk/src/test/run-pass/class-impl-very-parameterized-trait.rs
diff --git a/‎trunk/src/test/run-pass/class-implement-iface-cross-crate.rs renamed to ‎trunk/src/test/run-pass/class-implement-trait-cross-crate.rs
Lines changed: 3 additions & 3 deletions b/‎trunk/src/test/run-pass/class-implement-iface-cross-crate.rs renamed to ‎trunk/src/test/run-pass/class-implement-trait-cross-crate.rs
Lines changed: 3 additions & 3 deletions
diff --git a/‎trunk/src/test/run-pass/class-implement-ifaces.rs renamed to ‎trunk/src/test/run-pass/class-implement-traits.rs b/‎trunk/src/test/run-pass/class-implement-ifaces.rs renamed to ‎trunk/src/test/run-pass/class-implement-traits.rs
diff --git a/‎trunk/src/test/run-pass/class-implements-multiple-ifaces.rs renamed to ‎trunk/src/test/run-pass/class-implements-multiple-traits.rs b/‎trunk/src/test/run-pass/class-implements-multiple-ifaces.rs renamed to ‎trunk/src/test/run-pass/class-implements-multiple-traits.rs
diff --git a/‎trunk/src/test/run-pass/class-iface-bounded-param.rs renamed to ‎trunk/src/test/run-pass/class-trait-bounded-param.rs b/‎trunk/src/test/run-pass/class-iface-bounded-param.rs renamed to ‎trunk/src/test/run-pass/class-trait-bounded-param.rs
diff --git a/‎trunk/src/test/run-pass/monomorphize-iface-in-fn-at.rs renamed to ‎trunk/src/test/run-pass/monomorphize-trait-in-fn-at.rs b/‎trunk/src/test/run-pass/monomorphize-iface-in-fn-at.rs renamed to ‎trunk/src/test/run-pass/monomorphize-trait-in-fn-at.rs
diff --git a/‎trunk/src/test/run-pass/regions-iface.rs renamed to ‎trunk/src/test/run-pass/regions-trait.rs b/‎trunk/src/test/run-pass/regions-iface.rs renamed to ‎trunk/src/test/run-pass/regions-trait.rs
diff --git a/‎trunk/src/test/run-pass/iface-cast.rs renamed to ‎trunk/src/test/run-pass/trait-cast.rs b/‎trunk/src/test/run-pass/iface-cast.rs renamed to ‎trunk/src/test/run-pass/trait-cast.rs
diff --git a/‎trunk/src/test/run-pass/iface-generic.rs renamed to ‎trunk/src/test/run-pass/trait-generic.rs b/‎trunk/src/test/run-pass/iface-generic.rs renamed to ‎trunk/src/test/run-pass/trait-generic.rs
diff --git a/‎trunk/src/test/run-pass/iface-to-str.rs renamed to ‎trunk/src/test/run-pass/trait-to-str.rs b/‎trunk/src/test/run-pass/iface-to-str.rs renamed to ‎trunk/src/test/run-pass/trait-to-str.rs
diff --git a/‎trunk/src/test/run-pass/use-iface-before-def.rs renamed to ‎trunk/src/test/run-pass/use-trait-before-def.rs b/‎trunk/src/test/run-pass/use-iface-before-def.rs renamed to ‎trunk/src/test/run-pass/use-trait-before-def.rs
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b8f5dde9d47a329798db181600f211e9a102e36e
+refs/heads/master: 2f832d4b2d6ca861bb8f919226061c63965efd59
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 
@@ -1,7 +1,7 @@
 // xfail-fast
-// aux-build:cci_class_iface.rs
-use cci_class_iface;
-import cci_class_iface::animals::*;
+// aux-build:cci_class_trait.rs
+use cci_class_trait;
+import cci_class_trait::animals::*;
 
 class cat : noisy {
   priv {