about summary refs log tree commit diff
path: root/src/librustc
diff options
context:
space:
mode:
Diffstat (limited to 'src/librustc')
-rw-r--r--src/librustc/metadata/encoder.rs22
-rw-r--r--src/librustc/middle/borrowck/mod.rs20
-rw-r--r--src/librustc/middle/trans/base.rs24
-rw-r--r--src/librustc/middle/trans/glue.rs4
-rw-r--r--src/librustc/rustc.rs24
-rw-r--r--src/librustc/util/common.rs2
6 files changed, 48 insertions, 48 deletions
diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
index e3cc155b013..a2d9e86bf64 100644
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -1822,17 +1822,17 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
         }
 
         io::println("metadata stats:");
-        printfln!("    inline bytes: %u", ecx.stats.inline_bytes);
-        printfln!(" attribute bytes: %u", ecx.stats.attr_bytes);
-        printfln!("       dep bytes: %u", ecx.stats.dep_bytes);
-        printfln!(" lang item bytes: %u", ecx.stats.lang_item_bytes);
-        printfln!(" link args bytes: %u", ecx.stats.link_args_bytes);
-        printfln!("      impl bytes: %u", ecx.stats.impl_bytes);
-        printfln!("      misc bytes: %u", ecx.stats.misc_bytes);
-        printfln!("      item bytes: %u", ecx.stats.item_bytes);
-        printfln!("     index bytes: %u", ecx.stats.index_bytes);
-        printfln!("      zero bytes: %u", ecx.stats.zero_bytes);
-        printfln!("     total bytes: %u", ecx.stats.total_bytes);
+        println!("    inline bytes: {}", ecx.stats.inline_bytes);
+        println!(" attribute bytes: {}", ecx.stats.attr_bytes);
+        println!("       dep bytes: {}", ecx.stats.dep_bytes);
+        println!(" lang item bytes: {}", ecx.stats.lang_item_bytes);
+        println!(" link args bytes: {}", ecx.stats.link_args_bytes);
+        println!("      impl bytes: {}", ecx.stats.impl_bytes);
+        println!("      misc bytes: {}", ecx.stats.misc_bytes);
+        println!("      item bytes: {}", ecx.stats.item_bytes);
+        println!("     index bytes: {}", ecx.stats.index_bytes);
+        println!("      zero bytes: {}", ecx.stats.zero_bytes);
+        println!("     total bytes: {}", ecx.stats.total_bytes);
     }
 
     // Pad this, since something (LLVM, presumably) is cutting off the
diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs
index 852f1a53303..8b9dc40777a 100644
--- a/src/librustc/middle/borrowck/mod.rs
+++ b/src/librustc/middle/borrowck/mod.rs
@@ -100,16 +100,16 @@ pub fn check_crate(
 
     if tcx.sess.borrowck_stats() {
         io::println("--- borrowck stats ---");
-        printfln!("paths requiring guarantees: %u",
-                  bccx.stats.guaranteed_paths);
-        printfln!("paths requiring loans     : %s",
-                  make_stat(bccx, bccx.stats.loaned_paths_same));
-        printfln!("paths requiring imm loans : %s",
-                  make_stat(bccx, bccx.stats.loaned_paths_imm));
-        printfln!("stable paths              : %s",
-                  make_stat(bccx, bccx.stats.stable_paths));
-        printfln!("paths requiring purity    : %s",
-                  make_stat(bccx, bccx.stats.req_pure_paths));
+        println!("paths requiring guarantees: {}",
+                 bccx.stats.guaranteed_paths);
+        println!("paths requiring loans     : {}",
+                 make_stat(bccx, bccx.stats.loaned_paths_same));
+        println!("paths requiring imm loans : {}",
+                 make_stat(bccx, bccx.stats.loaned_paths_imm));
+        println!("stable paths              : {}",
+                 make_stat(bccx, bccx.stats.stable_paths));
+        println!("paths requiring purity    : {}",
+                 make_stat(bccx, bccx.stats.req_pure_paths));
     }
 
     return (bccx.root_map, bccx.write_guard_map);
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index 91316618c4f..3f021881b27 100644
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -121,7 +121,7 @@ impl Drop for _InsnCtxt {
 }
 
 pub fn push_ctxt(s: &'static str) -> _InsnCtxt {
-    debug!("new InsnCtxt: %s", s);
+    debug2!("new InsnCtxt: {}", s);
     do local_data::modify(task_local_insn_key) |c| {
         do c.map_move |ctx| {
             let mut ctx = (*ctx).clone();
@@ -3147,15 +3147,15 @@ pub fn trans_crate(sess: session::Session,
     write_metadata(ccx, crate);
     if ccx.sess.trans_stats() {
         io::println("--- trans stats ---");
-        printfln!("n_static_tydescs: %u", ccx.stats.n_static_tydescs);
-        printfln!("n_glues_created: %u", ccx.stats.n_glues_created);
-        printfln!("n_null_glues: %u", ccx.stats.n_null_glues);
-        printfln!("n_real_glues: %u", ccx.stats.n_real_glues);
-
-        printfln!("n_fns: %u", ccx.stats.n_fns);
-        printfln!("n_monos: %u", ccx.stats.n_monos);
-        printfln!("n_inlines: %u", ccx.stats.n_inlines);
-        printfln!("n_closures: %u", ccx.stats.n_closures);
+        println!("n_static_tydescs: {}", ccx.stats.n_static_tydescs);
+        println!("n_glues_created: {}", ccx.stats.n_glues_created);
+        println!("n_null_glues: {}", ccx.stats.n_null_glues);
+        println!("n_real_glues: {}", ccx.stats.n_real_glues);
+
+        println!("n_fns: {}", ccx.stats.n_fns);
+        println!("n_monos: {}", ccx.stats.n_monos);
+        println!("n_inlines: {}", ccx.stats.n_inlines);
+        println!("n_closures: {}", ccx.stats.n_closures);
         io::println("fn stats:");
         do sort::quick_sort(ccx.stats.fn_stats) |&(_, _, insns_a), &(_, _, insns_b)| {
             insns_a > insns_b
@@ -3163,14 +3163,14 @@ pub fn trans_crate(sess: session::Session,
         for tuple in ccx.stats.fn_stats.iter() {
             match *tuple {
                 (ref name, ms, insns) => {
-                    printfln!("%u insns, %u ms, %s", insns, ms, *name);
+                    println!("{} insns, {} ms, {}", insns, ms, *name);
                 }
             }
         }
     }
     if ccx.sess.count_llvm_insns() {
         for (k, v) in ccx.stats.llvm_insns.iter() {
-            printfln!("%-7u %s", *v, *k);
+            println!("{:7u} {}", *v, *k);
         }
     }
 
diff --git a/src/librustc/middle/trans/glue.rs b/src/librustc/middle/trans/glue.rs
index a760801d73a..28fffb6a80a 100644
--- a/src/librustc/middle/trans/glue.rs
+++ b/src/librustc/middle/trans/glue.rs
@@ -646,8 +646,8 @@ pub fn declare_tydesc(ccx: &mut CrateContext, t: ty::t) -> @mut tydesc_info {
     let llty = type_of(ccx, t);
 
     if ccx.sess.count_type_sizes() {
-        printfln!("%u\t%s", llsize_of_real(ccx, llty),
-                  ppaux::ty_to_str(ccx.tcx, t));
+        println!("{}\t{}", llsize_of_real(ccx, llty),
+                 ppaux::ty_to_str(ccx.tcx, t));
     }
 
     let has_header = match ty::get(t).sty {
diff --git a/src/librustc/rustc.rs b/src/librustc/rustc.rs
index 7599de1a9a3..9602c189455 100644
--- a/src/librustc/rustc.rs
+++ b/src/librustc/rustc.rs
@@ -130,13 +130,13 @@ pub fn version(argv0: &str) {
         Some(vers) => vers,
         None => "unknown version"
     };
-    printfln!("%s %s", argv0, vers);
-    printfln!("host: %s", host_triple());
+    println!("{} {}", argv0, vers);
+    println!("host: {}", host_triple());
 }
 
 pub fn usage(argv0: &str) {
     let message = fmt!("Usage: %s [OPTIONS] INPUT", argv0);
-    printfln!("%s\n\
+    println!("{}\n\
 Additional help:
     -W help             Print 'lint' options and default settings
     -Z help             Print internal options for debugging rustc\n",
@@ -167,16 +167,16 @@ Available lint options:
         str::from_utf8(vec::from_elem(max - s.len(), ' ' as u8)) + s
     }
     println("\nAvailable lint checks:\n");
-    printfln!("    %s  %7.7s  %s",
-              padded(max_key, "name"), "default", "meaning");
-    printfln!("    %s  %7.7s  %s\n",
-              padded(max_key, "----"), "-------", "-------");
+    println!("    {}  {:7.7s}  {}",
+             padded(max_key, "name"), "default", "meaning");
+    println!("    {}  {:7.7s}  {}\n",
+             padded(max_key, "----"), "-------", "-------");
     for (spec, name) in lint_dict.move_iter() {
         let name = name.replace("_", "-");
-        printfln!("    %s  %7.7s  %s",
-                  padded(max_key, name),
-                  lint::level_to_str(spec.default),
-                  spec.desc);
+        println!("    {}  {:7.7s}  {}",
+                 padded(max_key, name),
+                 lint::level_to_str(spec.default),
+                 spec.desc);
     }
     io::println("");
 }
@@ -187,7 +187,7 @@ pub fn describe_debug_flags() {
     for tuple in r.iter() {
         match *tuple {
             (ref name, ref desc, _) => {
-                printfln!("    -Z %-20s -- %s", *name, *desc);
+                println!("    -Z {:>20s} -- {}", *name, *desc);
             }
         }
     }
diff --git a/src/librustc/util/common.rs b/src/librustc/util/common.rs
index eeef2b798e2..bd7ca3a5529 100644
--- a/src/librustc/util/common.rs
+++ b/src/librustc/util/common.rs
@@ -22,7 +22,7 @@ pub fn time<T>(do_it: bool, what: ~str, thunk: &fn() -> T) -> T {
     let start = extra::time::precise_time_s();
     let rv = thunk();
     let end = extra::time::precise_time_s();
-    printfln!("time: %3.3f s\t%s", end - start, what);
+    println!("time: {:3.3f} s\t{}", end - start, what);
     rv
 }