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

4 files changed, 13 insertions, 13 deletions

diff --git a/src/rt/rust_box_annihilator.cpp b/src/rt/rust_box_annihilator.cpp
index 1ac0ac78ca7..ce4dc55cd70 100644
--- a/src/rt/rust_box_annihilator.cpp
+++ b/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();
     }
 
diff --git a/src/rt/rust_cc.cpp b/src/rt/rust_cc.cpp
index 1d3ae3ccccf..0106b468c90 100644
--- a/src/rt/rust_cc.cpp
+++ b/src/rt/rust_cc.cpp
@@ -140,7 +140,7 @@ class irc : public shape::data<irc,shape::ptr> {
         }
     }
 
-    void walk_iface2() {
+    void walk_trait2() {
         walk_box2();
     }
 
@@ -400,7 +400,7 @@ class mark : public shape::data<mark,shape::ptr> {
         }
     }
 
-    void walk_iface2() {
+    void walk_trait2() {
         walk_box2();
     }
 
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp
index bfe4b97936a..ae578081164 100644
--- a/src/rt/rust_shape.cpp
+++ b/src/rt/rust_shape.cpp
@@ -290,7 +290,7 @@ public:
         data<cmp,ptr_pair>::walk_rptr_contents1();
     }
 
-    void walk_iface2() {
+    void walk_trait2() {
         data<cmp,ptr_pair>::walk_box_contents1();
     }
 
diff --git a/src/rt/rust_shape.h b/src/rt/rust_shape.h
index ffbe6117422..fffbfad1d81 100644
--- a/src/rt/rust_shape.h
+++ b/src/rt/rust_shape.h
@@ -544,7 +544,7 @@ public:
           default: abort();
         }
     }
-    void walk_iface1() { DPRINT("iface"); }
+    void walk_trait1() { DPRINT("trait"); }
 
     void walk_tydesc1(char kind) {
         switch(kind) {
@@ -598,7 +598,7 @@ public:
                             { sa.set(sizeof(void *)*2, sizeof(void *)); }
     void walk_box1()        { sa.set(sizeof(void *),   sizeof(void *)); }
     void walk_fn1(char)     { sa.set(sizeof(void *)*2, sizeof(void *)); }
-    void walk_iface1()      { sa.set(sizeof(void *),   sizeof(void *)); }
+    void walk_trait1()      { sa.set(sizeof(void *),   sizeof(void *)); }
     void walk_tydesc1(char) { sa.set(sizeof(void *),   sizeof(void *)); }
     void walk_closure1();
 
@@ -851,7 +851,7 @@ protected:
     void walk_uniq_contents1();
     void walk_rptr_contents1();
     void walk_fn_contents1();
-    void walk_iface_contents1();
+    void walk_trait_contents1();
     void walk_variant1(tag_info &tinfo, tag_variant_t variant);
 
     static std::pair<uint8_t *,uint8_t *> get_vec_data_range(ptr dp);
@@ -927,10 +927,10 @@ public:
         dp = next_dp;
     }
 
-    void walk_iface1() {
+    void walk_trait1() {
         ALIGN_TO(rust_alignof<void *>());
         U next_dp = dp + sizeof(void *);
-        static_cast<T *>(this)->walk_iface2();
+        static_cast<T *>(this)->walk_trait2();
         dp = next_dp;
     }
 
@@ -1137,7 +1137,7 @@ void
 
 template<typename T,typename U>
 void
-data<T,U>::walk_iface_contents1() {
+data<T,U>::walk_trait_contents1() {
     walk_box_contents1();
 }
 
@@ -1234,10 +1234,10 @@ private:
         data<log,ptr>::walk_fn_contents1();
     }
 
-    void walk_iface2() {
-        out << prefix << "iface(";
+    void walk_trait2() {
+        out << prefix << "trait(";
         prefix = "";
-        data<log,ptr>::walk_iface_contents1();
+        data<log,ptr>::walk_trait_contents1();
         out << prefix << ")";
     }