Skip to content

Commit 4923a34

Browse files
committed
---
yaml --- r: 139069 b: refs/heads/try2 c: da64994 h: refs/heads/master i: 139067: 5fc5257 v: v3
1 parent 1319e1e commit 4923a34

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8b66578e66957dfdbfed60634e0c7661213e442f
8+
refs/heads/try2: da64994f18cbeae9f0fd1527fa46347a0bcea7c5
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ast.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ pub enum vstore {
386386
#[auto_decode]
387387
#[deriving_eq]
388388
pub enum expr_vstore {
389-
// FIXME (#3469): Change uint to @expr (actually only constant exprs)
390389
expr_vstore_fixed(Option<uint>), // [1,2,3,4]
391390
expr_vstore_uniq, // ~[1,2,3,4]
392391
expr_vstore_box, // @[1,2,3,4]

branches/try2/src/libsyntax/print/pprust.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ pub fn print_type_ex(s: @ps, &&ty: @ast::Ty, print_colons: bool) {
425425
}
426426
print_type(s, mt.ty);
427427
word(s.s, ~" * ");
428-
word(s.s, fmt!("%?", v));
428+
print_expr(s, v);
429429
word(s.s, ~"]");
430430
}
431431
ast::ty_mac(_) => {
@@ -1015,7 +1015,7 @@ pub fn print_mac(s: @ps, m: ast::mac) {
10151015
10161016
pub fn print_vstore(s: @ps, t: ast::vstore) {
10171017
match t {
1018-
ast::vstore_fixed(Some(i)) => word(s.s, fmt!("%?", i)),
1018+
ast::vstore_fixed(Some(i)) => word(s.s, fmt!("%u", i)),
10191019
ast::vstore_fixed(None) => word(s.s, ~"_"),
10201020
ast::vstore_uniq => word(s.s, ~"~"),
10211021
ast::vstore_box => word(s.s, ~"@"),
@@ -1028,7 +1028,7 @@ pub fn print_vstore(s: @ps, t: ast::vstore) {
10281028
10291029
pub fn print_expr_vstore(s: @ps, t: ast::expr_vstore) {
10301030
match t {
1031-
ast::expr_vstore_fixed(Some(i)) => word(s.s, fmt!("%?", i)),
1031+
ast::expr_vstore_fixed(Some(i)) => word(s.s, fmt!("%u", i)),
10321032
ast::expr_vstore_fixed(None) => word(s.s, ~"_"),
10331033
ast::expr_vstore_uniq => word(s.s, ~"~"),
10341034
ast::expr_vstore_box => word(s.s, ~"@"),

0 commit comments

Comments
 (0)