Drop the '2' suffix from logging macros

Who doesn't like a massive renaming?

2 files changed, 18 insertions, 18 deletions

diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 7c2856b7577..8bf3d5008db 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -129,13 +129,13 @@ pub mod jit {
             let cstore = sess.cstore;
             let r = cstore::get_used_crate_files(cstore);
             for cratepath in r.iter() {
-                debug2!("linking: {}", cratepath.display());
+                debug!("linking: {}", cratepath.display());
 
                 do cratepath.with_c_str |buf_t| {
                     if !llvm::LLVMRustLoadCrate(manager, buf_t) {
                         llvm_err(sess, ~"Could not link");
                     }
-                    debug2!("linked: {}", cratepath.display());
+                    debug!("linked: {}", cratepath.display());
                 }
             }
 
@@ -915,20 +915,20 @@ pub fn link_binary(sess: Session,
 
     let output = if *sess.building_library {
         let long_libname = output_dll_filename(sess.targ_cfg.os, lm);
-        debug2!("link_meta.name:  {}", lm.name);
-        debug2!("long_libname: {}", long_libname);
-        debug2!("out_filename: {}", out_filename.display());
+        debug!("link_meta.name:  {}", lm.name);
+        debug!("long_libname: {}", long_libname);
+        debug!("out_filename: {}", out_filename.display());
         let out_dirname = out_filename.dir_path();
-        debug2!("dirname(out_filename): {}", out_dirname.display());
+        debug!("dirname(out_filename): {}", out_dirname.display());
 
         out_filename.with_filename(long_libname)
     } else {
         out_filename.clone()
     };
 
-    debug2!("output: {}", output.display());
+    debug!("output: {}", output.display());
     let cc_args = link_args(sess, obj_filename, out_filename, lm);
-    debug2!("{} link args: {}", cc_prog, cc_args.connect(" "));
+    debug!("{} link args: {}", cc_prog, cc_args.connect(" "));
     if (sess.opts.debugging_opts & session::print_link_args) != 0 {
         io::println(format!("{} link args: {}", cc_prog, cc_args.connect(" ")));
     }
diff --git a/src/librustc/back/rpath.rs b/src/librustc/back/rpath.rs
index faf8dd25186..3d6a8350795 100644
--- a/src/librustc/back/rpath.rs
+++ b/src/librustc/back/rpath.rs
@@ -29,7 +29,7 @@ pub fn get_rpath_flags(sess: session::Session, out_filename: &Path)
         return ~[];
     }
 
-    debug2!("preparing the RPATH!");
+    debug!("preparing the RPATH!");
 
     let sysroot = sess.filesearch.sysroot();
     let output = out_filename;
@@ -60,13 +60,13 @@ fn get_rpaths(os: session::Os,
               output: &Path,
               libs: &[Path],
               target_triple: &str) -> ~[~str] {
-    debug2!("sysroot: {}", sysroot.display());
-    debug2!("output: {}", output.display());
-    debug2!("libs:");
+    debug!("sysroot: {}", sysroot.display());
+    debug!("output: {}", output.display());
+    debug!("libs:");
     for libpath in libs.iter() {
-        debug2!("    {}", libpath.display());
+        debug!("    {}", libpath.display());
     }
-    debug2!("target_triple: {}", target_triple);
+    debug!("target_triple: {}", target_triple);
 
     // Use relative paths to the libraries. Binaries can be moved
     // as long as they maintain the relative relationship to the
@@ -81,9 +81,9 @@ fn get_rpaths(os: session::Os,
     let fallback_rpaths = ~[get_install_prefix_rpath(target_triple)];
 
     fn log_rpaths(desc: &str, rpaths: &[~str]) {
-        debug2!("{} rpaths:", desc);
+        debug!("{} rpaths:", desc);
         for rpath in rpaths.iter() {
-            debug2!("    {}", *rpath);
+            debug!("    {}", *rpath);
         }
     }
 
@@ -188,7 +188,7 @@ mod test {
         let res = get_install_prefix_rpath("triple");
         let mut d = Path::new(env!("CFG_PREFIX"));
         d.push("lib/rustc/triple/lib");
-        debug2!("test_prefix_path: {} vs. {}",
+        debug!("test_prefix_path: {} vs. {}",
                res,
                d.display());
         assert!(res.as_bytes().ends_with(d.as_vec()));
@@ -248,7 +248,7 @@ mod test {
     fn test_get_absolute_rpath() {
         let res = get_absolute_rpath(&Path::new("lib/libstd.so"));
         let lib = os::make_absolute(&Path::new("lib"));
-        debug2!("test_get_absolute_rpath: {} vs. {}",
+        debug!("test_get_absolute_rpath: {} vs. {}",
                res.to_str(), lib.display());
 
         // FIXME (#9639): This needs to handle non-utf8 paths