about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-10-08 09:03:26 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-10-08 09:03:26 -0700
commite3f1d342e735ea22b6bf1d12b6548d5fccb358dd (patch)
treea809d2db28228309356e97865822b42f6fcf5f68 /src/libsyntax/parse
parent639f568ec9aab94f3d46abdc9a2b74e6bec4705a (diff)
parent0bd6da8a8c93143325cb45e8a074ccf7121ca168 (diff)
downloadrust-e3f1d342e735ea22b6bf1d12b6548d5fccb358dd.tar.gz
rust-e3f1d342e735ea22b6bf1d12b6548d5fccb358dd.zip
Merge remote-tracking branch 'erickt/incoming' into snap-2012-10-05
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/token.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 19e79a4ae7a..dce4dc3bbc7 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -2,8 +2,8 @@ use util::interner;
 use util::interner::interner;
 use std::map::HashMap;
 
-#[auto_serialize2]
-#[auto_deserialize2]
+#[auto_serialize]
+#[auto_deserialize]
 enum binop {
     PLUS,
     MINUS,
@@ -17,8 +17,8 @@ enum binop {
     SHR,
 }
 
-#[auto_serialize2]
-#[auto_deserialize2]
+#[auto_serialize]
+#[auto_deserialize]
 enum token {
     /* Expression-operator symbols. */
     EQ,
@@ -75,8 +75,8 @@ enum token {
     EOF,
 }
 
-#[auto_serialize2]
-#[auto_deserialize2]
+#[auto_serialize]
+#[auto_deserialize]
 /// For interpolation during macro expansion.
 enum nonterminal {
     nt_item(@ast::item),