Remove various istr conversions. Issue #855

Author: brson

src/comp/middle/freevars.rs

@@ -120,8 +120,8 @@ fn annotate_freevars(def_map: &resolve::def_map,
 fn get_freevars(tcx: &ty::ctxt, fid: ast::node_id) -> freevar_info {
     alt tcx.freevars.find(fid) {
       none. {
-        fail "get_freevars: " + istr::to_estr(int::str(fid))
-            + " has no freevars";
+        fail ~"get_freevars: " + int::str(fid)
+            + ~" has no freevars";
       }
       some(d) { ret d; }
     }

src/comp/middle/tstate/annotate.rs

@@ -62,7 +62,7 @@ fn node_ids_in_fn(f: &_fn, tps: &[ty_param], sp: &span, i: &fn_ident,
 
 fn init_vecs(ccx: &crate_ctxt, node_ids: &[node_id], len: uint) {
     for i: node_id in node_ids {
-        log istr::to_estr(int::str(i) + ~" |-> " + uint::str(len));
+        log int::str(i) + ~" |-> " + uint::str(len);
         add_node(ccx, i, empty_ann(len));
     }
 }

src/comp/middle/tstate/auxiliary.rs

@@ -331,8 +331,8 @@ fn get_ts_ann(ccx: &crate_ctxt, i: node_id) -> option::t<ts_ann> {
 fn node_id_to_ts_ann(ccx: &crate_ctxt, id: node_id) -> ts_ann {
     alt get_ts_ann(ccx, id) {
       none. {
-        log_err "node_id_to_ts_ann: no ts_ann for node_id "
-            + istr::to_estr(int::str(id));
+        log_err ~"node_id_to_ts_ann: no ts_ann for node_id "
+            + int::str(id);
         fail;
       }
       some(t) { ret t; }
@@ -534,8 +534,8 @@ fn constraints_expr(cx: &ty::ctxt, e: @expr) -> [@ty::constr] {
 fn node_id_to_def_strict(cx: &ty::ctxt, id: node_id) -> def {
     alt cx.def_map.find(id) {
       none. {
-        log_err "node_id_to_def: node_id "
-            + istr::to_estr(int::str(id)) + " has no def";
+        log_err ~"node_id_to_def: node_id "
+            + int::str(id) + ~" has no def";
         fail;
       }
       some(d) { ret d; }

src/comp/middle/tstate/collect_locals.rs

@@ -147,9 +147,9 @@ fn mk_fn_info(ccx: &crate_ctxt, f: &_fn, tp: &[ty_param], f_sp: &span,
          i_diverge: ninit(diverges_id, diverges_name),
          used_vars: v};
     ccx.fm.insert(id, rslt);
-    log istr::to_estr(name + ~" has "
+    log name + ~" has "
                       + std::uint::str(num_constraints(rslt))
-                      + ~" constraints");
+                      + ~" constraints";
 }
 
 

src/comp/syntax/ext/ifmt.rs

@@ -263,8 +263,7 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
     fn log_conv(c: conv) {
         alt c.param {
           some(p) {
-            log "param: "
-                + istr::to_estr(std::int::to_str(p, 10u));
+            log ~"param: " + std::int::to_str(p, 10u);
           }
           _ { log "param: none"; }
         }
@@ -278,21 +277,21 @@ fn pieces_to_expr(cx: &ext_ctxt, sp: span, pieces: &[piece],
             }
         }
         alt c.width {
-          count_is(i) { log "width: count is "
-              + istr::to_estr(std::int::to_str(i, 10u)); }
+          count_is(i) { log ~"width: count is "
+              + std::int::to_str(i, 10u); }
           count_is_param(i) {
-            log "width: count is param "
-                + istr::to_estr(std::int::to_str(i, 10u));
+            log ~"width: count is param "
+                + std::int::to_str(i, 10u);
           }
           count_is_next_param. { log "width: count is next param"; }
           count_implied. { log "width: count is implied"; }
         }
         alt c.precision {
-          count_is(i) { log "prec: count is "
-              + istr::to_estr(std::int::to_str(i, 10u)); }
+          count_is(i) { log ~"prec: count is "
+              + std::int::to_str(i, 10u); }
           count_is_param(i) {
-            log "prec: count is param "
-                + istr::to_estr(std::int::to_str(i, 10u));
+            log ~"prec: count is param "
+                + std::int::to_str(i, 10u);
           }
           count_is_next_param. { log "prec: count is next param"; }
           count_implied. { log "prec: count is implied"; }

src/comp/util/ppaux.rs

@@ -46,8 +46,8 @@ fn get_id_ident(cx: &ctxt, id: ast::def_id) -> istr {
     if id.crate != ast::local_crate {
         alt cx.ext_map.find(id) {
           some(j) { istr::connect(j, ~"::") }
-          _ { fail ("get_id_ident: can't find item in ext_map, id.crate = "
-                    + istr::to_estr(int::str(id.crate))) }
+          _ { fail (~"get_id_ident: can't find item in ext_map, id.crate = "
+                    + int::str(id.crate)) }
         }
     } else {
         alt cx.items.find(id.node) {

src/lib/ebml.rs

@@ -67,8 +67,7 @@ fn get_doc(d: doc, tg: uint) -> doc {
     alt maybe_get_doc(d, tg) {
       some(d) { ret d; }
       none. {
-        log_err "failed to find block with tag "
-            + istr::to_estr(uint::to_str(tg, 10u));
+        log_err ~"failed to find block with tag " + uint::to_str(tg, 10u);
         fail;
       }
     }

src/test/bench/99bob-pattern.rs

@@ -30,11 +30,12 @@ fn show(b: bottle) {
                 "1 bottle of beer on the wall.";
       }
       multiple(n) {
-        let nb: str = istr::to_estr(int::to_str(n, 10u));
-        let mb: str = istr::to_estr(int::to_str(n - 1, 10u));
-        log nb + " bottles of beer on the wall, " + nb + " bottles of beer,";
-        log "Take one down and pass it around, " + mb +
-                " bottles of beer on the wall.";
+        let nb: istr = int::to_str(n, 10u);
+        let mb: istr = int::to_str(n - 1, 10u);
+        log nb + ~" bottles of beer on the wall, " + nb +
+            ~" bottles of beer,";
+        log ~"Take one down and pass it around, " + mb +
+                ~" bottles of beer on the wall.";
       }
     }
 }

src/test/bench/99bob-tail.rs

@@ -9,11 +9,12 @@ import std::istr;
 
 fn main() {
     fn multiple(n: int) {
-        let nb: str = istr::to_estr(int::to_str(n, 10u));
-        let mb: str = istr::to_estr(int::to_str(n - 1, 10u));
-        log nb + " bottles of beer on the wall, " + nb + " bottles of beer,";
-        log "Take one down and pass it around, " + mb +
-                " bottles of beer on the wall.";
+        let nb: istr = int::to_str(n, 10u);
+        let mb: istr = int::to_str(n - 1, 10u);
+        log nb + ~" bottles of beer on the wall, " + nb +
+            ~" bottles of beer,";
+        log ~"Take one down and pass it around, " + mb +
+            ~" bottles of beer on the wall.";
         log "";
         if n > 3 { be multiple(n - 1); } else { be dual(); }
     }

src/test/compiletest/compiletest.rs

@@ -49,7 +49,7 @@ fn parse_config(args: &[istr]) -> config {
         alt getopts::getopts(args_, opts) {
           getopts::success(m) { m }
           getopts::failure(f) {
-            fail istr::to_estr(getopts::fail_str(f))
+            fail getopts::fail_str(f)
           }
         };