From ce808bbc6f2ac387f2d2ab597629b81cdd0932a9 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Tue, 26 Jul 2011 10:40:28 +0200 Subject: [PATCH] Make the pretty-printer output new-style syntax for local decls --- src/comp/syntax/parse/parser.rs | 1 - src/comp/syntax/print/pprust.rs | 18 ++++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index b8220d814a4a..e4bb9c6e1e3b 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 a99da8f5d1ee..6fdc4e647240 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);