Drop the '2' suffix from logging macros

Who doesn't like a massive renaming?

2 files changed, 7 insertions, 7 deletions

diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs
index 954db42c89b..f5c60417bac 100644
--- a/src/libstd/rand/mod.rs
+++ b/src/libstd/rand/mod.rs
@@ -175,7 +175,7 @@ pub trait Rng {
                 *b = (rand >> 8) as u8;
                 *c = (rand >> 16) as u8;
             }
-            _ => fail2!("Rng.fill_bytes: the impossible occurred: remaining != 1, 2 or 3")
+            _ => fail!("Rng.fill_bytes: the impossible occurred: remaining != 1, 2 or 3")
         }
     }
 
@@ -797,7 +797,7 @@ mod test {
         let mut r = rng();
         let a = r.gen::<f64>();
         let b = r.gen::<f64>();
-        debug2!("{:?}", (a, b));
+        debug!("{:?}", (a, b));
     }
 
     #[test]
@@ -810,9 +810,9 @@ mod test {
     #[test]
     fn test_gen_ascii_str() {
         let mut r = rng();
-        debug2!("{}", r.gen_ascii_str(10u));
-        debug2!("{}", r.gen_ascii_str(10u));
-        debug2!("{}", r.gen_ascii_str(10u));
+        debug!("{}", r.gen_ascii_str(10u));
+        debug!("{}", r.gen_ascii_str(10u));
+        debug!("{}", r.gen_ascii_str(10u));
         assert_eq!(r.gen_ascii_str(0u).len(), 0u);
         assert_eq!(r.gen_ascii_str(10u).len(), 10u);
         assert_eq!(r.gen_ascii_str(16u).len(), 16u);
diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs
index 961a5b2cd28..f1e67da815e 100644
--- a/src/libstd/rand/reader.rs
+++ b/src/libstd/rand/reader.rs
@@ -68,9 +68,9 @@ impl<R: Reader> Rng for ReaderRng<R> {
         if v.len() == 0 { return }
         match self.reader.read(v) {
             Some(n) if n == v.len() => return,
-            Some(n) => fail2!("ReaderRng.fill_bytes could not fill buffer: \
+            Some(n) => fail!("ReaderRng.fill_bytes could not fill buffer: \
                               read {} out of {} bytes.", n, v.len()),
-            None => fail2!("ReaderRng.fill_bytes reached eof.")
+            None => fail!("ReaderRng.fill_bytes reached eof.")
         }
     }
 }