---

yaml
---
r: 5053
b: refs/heads/master
c: 9e2c5f7
h: refs/heads/master
i:
  5051: 5aa0a6a
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0212a63bf888008cffe256663317e3472fbab4
+refs/heads/master: 9e2c5f77a413bf99fff1d8b4f0629127a5f9bbd3

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

@@ -243,7 +243,6 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
         }
         alt cnv.ty {
           ty_str. { ret make_conv_call(cx, arg.span, ~"str", cnv, arg); }
-          ty_istr. { ret make_conv_call(cx, arg.span, ~"istr", cnv, arg); }
           ty_int(sign) {
             alt sign {
               signed. { ret make_conv_call(cx, arg.span, ~"int", cnv, arg); }
@@ -300,7 +299,6 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
         alt c.ty {
           ty_bool. { log "type: bool"; }
           ty_str. { log "type: str"; }
-          ty_istr. { log "type: istr"; }
           ty_char. { log "type: char"; }
           ty_int(s) {
             alt s {

trunk/src/lib/extfmt.rs

@@ -41,8 +41,6 @@ mod ct {
         ty_bits;
         ty_hex(caseness);
         ty_octal;
-        // FIXME: Transitional
-        ty_istr;
         // FIXME: More types
     }
     tag flag {
@@ -226,8 +224,6 @@ mod ct {
                 ty_bool
             } else if str::eq(tstr, "s") {
                 ty_str
-            } else if str::eq(tstr, "S") {
-                ty_istr
             } else if str::eq(tstr, "c") {
                 ty_char
             } else if str::eq(tstr, "d") || str::eq(tstr, "i") {
@@ -325,10 +321,6 @@ mod rt {
         ret pad(cv, unpadded, pad_nozero);
     }
 
-    fn conv_istr(cv: &conv, s: &istr) -> str {
-        ret conv_str(cv, istr::to_estr(s));
-    }
-
     // Convert an int to string with minimum number of digits. If precision is
     // 0 and num is 0 then the result is the empty string.
     fn int_to_str_prec(num: int, radix: uint, prec: uint) -> str {