Merge remote-tracking branch 'remotes/origin/incoming' into serial

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs
index de01d258449..52bb4110082 100644
--- a/src/libsyntax/ext/auto_encode.rs
+++ b/src/libsyntax/ext/auto_encode.rs
@@ -1281,13 +1281,13 @@ mod test {
             f();
         }
 
-        fn read_map<T>(&self, f: &fn(uint) -> T) -> T {
+        fn emit_map<T>(&self, f: &fn(uint) -> T) -> T {
             self.add_unknown_to_log(); f(0);
         }
-        fn read_map_elt_key<T>(&self, idx: uint, f: &fn() -> T) -> T {
+        fn emit_map_elt_key<T>(&self, idx: uint, f: &fn() -> T) -> T {
             self.add_unknown_to_log(); f();
         }
-        fn read_map_elt_val<T>(&self, idx: uint, f: &fn() -> T) -> T {
+        fn emit_map_elt_val<T>(&self, idx: uint, f: &fn() -> T) -> T {
             self.add_unknown_to_log(); f();
         }
     }