---

yaml
---
r: 11975
b: refs/heads/master
c: bbfa08d
h: refs/heads/master
i:
  11973: 595215a
  11971: 344ffc4
  11967: aec07de
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a0c6ad0c510ca8b6b810ebb36bfa42c4a29b62a2
+refs/heads/master: bbfa08d9474bd08b03718639ad82315d66097e6e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/extfmt.rs

@@ -269,12 +269,7 @@ mod rt {
         flag_space_for_sign,
         flag_sign_always,
         flag_alternate,
-
-
-        // FIXME: This is a hack to avoid creating 0-length vec exprs,
-        // which have some difficulty typechecking currently. See
-        // comments in front::extfmt::make_flags
-        // (once #1993 is addressed, this won't be necessary)
+        // FIXME(1993): This is no longer needed. Remove after a snapshot
         flag_none,
     }
     enum count { count_is(int), count_implied, }

trunk/src/rustc/syntax/ext/fmt.rs

@@ -68,13 +68,6 @@ fn pieces_to_expr(cx: ext_ctxt, sp: span, pieces: [piece], args: [@ast::expr])
                 }
                 flagexprs += [make_rt_path_expr(cx, sp, fstr)];
             }
-            // FIXME: 0-length vectors can't have their type inferred
-            // through the rec that these flags are a member of, so
-            // this is a hack placeholder flag
-
-            if vec::len::<@ast::expr>(flagexprs) == 0u {
-                flagexprs += [make_rt_path_expr(cx, sp, "flag_none")];
-            }
             ret mk_vec_e(cx, sp, flagexprs);
         }
         fn make_count(cx: ext_ctxt, sp: span, cnt: count) -> @ast::expr {