2 files changed, 15 insertions, 29 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index db04c46ea59..16399674b55 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -71,7 +71,7 @@ impl<S:Encoder> Encodable<S> for ident {
             Some(intr) => intr
         };
 
-        s.emit_owned_str(*(*intr).get(*self));
+        s.emit_str(*(*intr).get(*self));
     }
 }
 
@@ -84,7 +84,7 @@ impl<D:Decoder> Decodable<D> for ident {
             Some(intr) => intr
         };
 
-        (*intr).intern(@d.read_owned_str())
+        (*intr).intern(@d.read_str())
     }
 }
 
diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs
index d7e0e9aa550..d25792355a7 100644
--- a/src/libsyntax/ext/auto_encode.rs
+++ b/src/libsyntax/ext/auto_encode.rs
@@ -1240,14 +1240,7 @@ mod test {
         fn emit_float(&self, +_v: float) { self.add_unknown_to_log(); }
 
         fn emit_char(&self, +_v: char) { self.add_unknown_to_log(); }
-
-        fn emit_borrowed_str(&self, +_v: &str) { self.add_unknown_to_log(); }
-        fn emit_owned_str(&self, +_v: &str) { self.add_unknown_to_log(); }
-        fn emit_managed_str(&self, +_v: &str) { self.add_unknown_to_log(); }
-
-        fn emit_borrowed(&self, f: &fn()) { self.add_unknown_to_log(); f() }
-        fn emit_owned(&self, f: &fn()) { self.add_unknown_to_log(); f() }
-        fn emit_managed(&self, f: &fn()) { self.add_unknown_to_log(); f() }
+        fn emit_str(&self, +_v: &str) { self.add_unknown_to_log(); }
 
         fn emit_enum(&self, name: &str, f: &fn()) {
             self.add_to_log(CallToEmitEnum(name.to_str())); f(); }
@@ -1262,23 +1255,13 @@ mod test {
             self.add_to_log(CallToEmitEnumVariantArg (idx)); f();
         }
 
-        fn emit_borrowed_vec(&self, +_len: uint, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
-
-        fn emit_owned_vec(&self, +_len: uint, f: &fn()) {
+        fn emit_seq(&self, +_len: uint, f: &fn()) {
             self.add_unknown_to_log(); f();
         }
-        fn emit_managed_vec(&self, +_len: uint, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
-        fn emit_vec_elt(&self, +_idx: uint, f: &fn()) {
+        fn emit_seq_elt(&self, +_idx: uint, f: &fn()) {
             self.add_unknown_to_log(); f();
         }
 
-        fn emit_rec(&self, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
         fn emit_struct(&self, name: &str, +len: uint, f: &fn()) {
             self.add_to_log(CallToEmitStruct (name.to_str(),len)); f();
         }
@@ -1286,13 +1269,6 @@ mod test {
             self.add_to_log(CallToEmitField (name.to_str(),idx)); f();
         }
 
-        fn emit_tup(&self, +_len: uint, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
-        fn emit_tup_elt(&self, +_idx: uint, f: &fn()) {
-            self.add_unknown_to_log(); f();
-        }
-
         fn emit_option(&self, f: &fn()) {
             self.add_to_log(CallToEmitOption);
             f();
@@ -1304,6 +1280,16 @@ mod test {
             self.add_to_log(CallToEmitOptionSome);
             f();
         }
+
+        fn emit_map(&self, _len: uint, f: &fn()) {
+            self.add_unknown_to_log(); f();
+        }
+        fn emit_map_elt_key(&self, _idx: uint, f: &fn()) {
+            self.add_unknown_to_log(); f();
+        }
+        fn emit_map_elt_val(&self, _idx: uint, f: &fn()) {
+            self.add_unknown_to_log(); f();
+        }
     }