about summary refs log tree commit diff
path: root/src/comp
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2011-07-26 10:40:28 +0200
committerMarijn Haverbeke <marijnh@gmail.com>2011-07-26 10:40:28 +0200
commitce808bbc6f2ac387f2d2ab597629b81cdd0932a9 (patch)
tree9deeb7dec05a023c4f04976812a6df896a88de54 /src/comp
parent252b8ffe42a1db5b404b336b9d6c9141088b9926 (diff)
downloadrust-ce808bbc6f2ac387f2d2ab597629b81cdd0932a9.tar.gz
rust-ce808bbc6f2ac387f2d2ab597629b81cdd0932a9.zip
Make the pretty-printer output new-style syntax for local decls
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/syntax/parse/parser.rs1
-rw-r--r--src/comp/syntax/print/pprust.rs18
2 files changed, 8 insertions, 11 deletions
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index b8220d814a4..e4bb9c6e1e3 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -170,7 +170,6 @@ fn bad_expr_word_table() -> hashmap[str, ()] {
     words.insert("state", ());
     words.insert("gc", ());
     words.insert("native", ());
-    words.insert("auto", ());
     words.insert("fn", ());
     words.insert("pred", ());
     words.insert("iter", ());
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index a99da8f5d1e..6fdc4e64724 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -1052,18 +1052,16 @@ fn print_decl(&ps s, &@ast::decl decl) {
         case (ast::decl_local(?locs)) {
             space_if_not_hardbreak(s);
             ibox(s, indent_unit);
-            alt (locs.(0).node.ty) {
-                case (some(?ty)) {
-                    word_nbsp(s, "let");
-                    print_type(s, *ty);
-                    space(s.s);
-                }
-                case (_) {
-                    word_nbsp(s, "auto");
-                }
-            }
+            word_nbsp(s, "let");
             fn print_local(&ps s, &@ast::local loc) {
                 word(s.s, loc.node.ident);
+                alt (loc.node.ty) {
+                  some(?ty) {
+                    word_space(s, ":");
+                    print_type(s, *ty);
+                  }
+                  _ {}
+                }
                 alt loc.node.init {
                   some(?init) {
                     space(s.s);