auto merge of #10006 : alexcrichton/rust/another-massive-rename, r=brson

Drop the `2` suffix on all of them, updating all code in the process of doing so. This is a completely automated change, and it's dependent on the snapshots going through.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index 28c38ac9b53..a6f9e11e40e 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -626,7 +626,7 @@ mod test {
             let result = spawntask_try(||());
             rtdebug!("trying first assert");
             assert!(result.is_ok());
-            let result = spawntask_try(|| fail2!());
+            let result = spawntask_try(|| fail!());
             rtdebug!("trying second assert");
             assert!(result.is_err());
         }
@@ -644,7 +644,7 @@ mod test {
     #[test]
     fn logging() {
         do run_in_newsched_task() {
-            info2!("here i am. logging in a newsched task");
+            info!("here i am. logging in a newsched task");
         }
     }
 
@@ -686,7 +686,7 @@ mod test {
     fn linked_failure() {
         do run_in_newsched_task() {
             let res = do spawntask_try {
-                spawntask_random(|| fail2!());
+                spawntask_random(|| fail!());
             };
             assert!(res.is_err());
         }