about summary refs log tree commit diff
path: root/src/libstd/select.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-10-21 13:08:31 -0700
committerAlex Crichton <alex@alexcrichton.com>2013-10-22 08:09:56 -0700
commitdaf5f5a4d10513ff42e79fa7ef8819b170f3a13d (patch)
tree7a07a79c43e02debcc6bbb33d90a5e41b70119e6 /src/libstd/select.rs
parent15a6bdebab4e7b811b9a902e3f8ed225c59af06e (diff)
downloadrust-daf5f5a4d10513ff42e79fa7ef8819b170f3a13d.tar.gz
rust-daf5f5a4d10513ff42e79fa7ef8819b170f3a13d.zip
Drop the '2' suffix from logging macros
Who doesn't like a massive renaming?
Diffstat (limited to 'src/libstd/select.rs')
-rw-r--r--src/libstd/select.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/select.rs b/src/libstd/select.rs
index 8ce23f4b53b..62a09984794 100644
--- a/src/libstd/select.rs
+++ b/src/libstd/select.rs
@@ -35,7 +35,7 @@ pub trait SelectPort<T> : SelectPortInner<T> { }
 /// port whose data is ready. (If multiple are ready, returns the lowest index.)
 pub fn select<A: Select>(ports: &mut [A]) -> uint {
     if ports.is_empty() {
-        fail2!("can't select on an empty list");
+        fail!("can't select on an empty list");
     }
 
     for (index, port) in ports.mut_iter().enumerate() {
@@ -116,7 +116,7 @@ pub fn select2<TA, A: SelectPort<TA>, TB, B: SelectPort<TB>>(mut a: A, mut b: B)
     match result {
         0 => Left ((a.recv_ready(), b)),
         1 => Right((a, b.recv_ready())),
-        x => fail2!("impossible case in select2: {:?}", x)
+        x => fail!("impossible case in select2: {:?}", x)
     }
 }
 
@@ -335,7 +335,7 @@ mod test {
                         let _ = dead_cs;
                     }
                     do task::spawn {
-                        fail2!(); // should kill sibling awake
+                        fail!(); // should kill sibling awake
                     }
 
                     // wait for killed selector to close (NOT send on) its c.