std: remove Encoder::emit_{owned,managed}_str and Decoder::read_{owned,managed}_str

2 files changed, 3 insertions, 6 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index c2f098f3c3e..78debbba31c 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -70,7 +70,7 @@ impl<S:Encoder> Encodable<S> for ident {
             Some(intr) => intr
         };
 
-        s.emit_owned_str(*(*intr).get(*self));
+        s.emit_str(*(*intr).get(*self));
     }
 }
 
@@ -83,7 +83,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..54f9967e64a 100644
--- a/src/libsyntax/ext/auto_encode.rs
+++ b/src/libsyntax/ext/auto_encode.rs
@@ -1240,10 +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_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() }