From da64994f18cbeae9f0fd1527fa46347a0bcea7c5 Mon Sep 17 00:00:00 2001 From: Luqman Aden Date: Tue, 5 Mar 2013 18:09:33 -0800 Subject: [PATCH] Fix pretty printer for fixed length vectors. --- src/libsyntax/ast.rs | 1 - src/libsyntax/print/pprust.rs | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index e2e750e8903f..65eeff5bbab3 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -386,7 +386,6 @@ pub enum vstore { #[auto_decode] #[deriving_eq] pub enum expr_vstore { - // FIXME (#3469): Change uint to @expr (actually only constant exprs) expr_vstore_fixed(Option), // [1,2,3,4] expr_vstore_uniq, // ~[1,2,3,4] expr_vstore_box, // @[1,2,3,4] diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index ab7fe8dc063b..93583a1487a8 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -425,7 +425,7 @@ pub fn print_type_ex(s: @ps, &&ty: @ast::Ty, print_colons: bool) { } print_type(s, mt.ty); word(s.s, ~" * "); - word(s.s, fmt!("%?", v)); + print_expr(s, v); word(s.s, ~"]"); } ast::ty_mac(_) => { @@ -1015,7 +1015,7 @@ pub fn print_mac(s: @ps, m: ast::mac) { pub fn print_vstore(s: @ps, t: ast::vstore) { match t { - ast::vstore_fixed(Some(i)) => word(s.s, fmt!("%?", i)), + ast::vstore_fixed(Some(i)) => word(s.s, fmt!("%u", i)), ast::vstore_fixed(None) => word(s.s, ~"_"), ast::vstore_uniq => word(s.s, ~"~"), ast::vstore_box => word(s.s, ~"@"), @@ -1028,7 +1028,7 @@ pub fn print_vstore(s: @ps, t: ast::vstore) { pub fn print_expr_vstore(s: @ps, t: ast::expr_vstore) { match t { - ast::expr_vstore_fixed(Some(i)) => word(s.s, fmt!("%?", i)), + ast::expr_vstore_fixed(Some(i)) => word(s.s, fmt!("%u", i)), ast::expr_vstore_fixed(None) => word(s.s, ~"_"), ast::expr_vstore_uniq => word(s.s, ~"~"), ast::expr_vstore_box => word(s.s, ~"@"),