---

yaml
---
r: 81294
b: refs/heads/snap-stage3
c: ebf5f40
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 630082ca8946ff2d0e814a73a2594ba65e1b29be
+refs/heads/snap-stage3: ebf5f406ef6e291655ec9eca5aa8bd95775cc67c
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/compile-fail/assign-imm-local-twice.rs

@@ -11,9 +11,9 @@
 fn test() {
     let v: int;
     v = 1; //~ NOTE prior assignment occurs here
-    info!("v=%d", v);
+    info2!("v={}", v);
     v = 2; //~ ERROR re-assignment of immutable variable
-    info!("v=%d", v);
+    info2!("v={}", v);
 }
 
 fn main() {

branches/snap-stage3/src/test/compile-fail/assign-to-method.rs

@@ -27,5 +27,5 @@ fn cat(in_x : uint, in_y : int) -> cat {
 
 fn main() {
   let nyan : cat = cat(52u, 99);
-  nyan.speak = || info!("meow"); //~ ERROR attempted to take value of method
+  nyan.speak = || info2!("meow"); //~ ERROR attempted to take value of method
 }

branches/snap-stage3/src/test/compile-fail/autoderef-full-lval.rs

@@ -21,11 +21,11 @@ fn main() {
     let a: clam = clam{x: @1, y: @2};
     let b: clam = clam{x: @10, y: @20};
     let z: int = a.x + b.y; //~ ERROR binary operation + cannot be applied to type `@int`
-    info!(z);
+    info2!("{:?}", z);
     assert_eq!(z, 21);
     let forty: fish = fish{a: @40};
     let two: fish = fish{a: @2};
     let answer: int = forty.a + two.a;  //~ ERROR binary operation + cannot be applied to type `@int`
-    info!(answer);
+    info2!("{:?}", answer);
     assert_eq!(answer, 42);
 }

branches/snap-stage3/src/test/compile-fail/bad-bang-ann.rs

@@ -12,7 +12,7 @@
 // Tests that a function with a ! annotation always actually fails
 
 fn bad_bang(i: uint) -> ! {
-    if i < 0u { } else { fail!(); }
+    if i < 0u { } else { fail2!(); }
     //~^ ERROR expected `!` but found `()`
 }
 

branches/snap-stage3/src/test/compile-fail/bad-const-type.rs

@@ -11,4 +11,4 @@
 // error-pattern:expected `~str` but found `int`
 
 static i: ~str = 10i;
-fn main() { info!(i); }
+fn main() { info2!("{:?}", i); }

branches/snap-stage3/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-1.rs

@@ -12,14 +12,14 @@ struct X { x: () }
 
 impl Drop for X {
     fn drop(&mut self) {
-        error!("destructor runs");
+        error2!("destructor runs");
     }
 }
 
 fn main() {
     let x = Some(X { x: () });
     match x {
         Some(ref _y @ _z) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => fail!()
+        None => fail2!()
     }
 }

branches/snap-stage3/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-2.rs

@@ -12,14 +12,14 @@ struct X { x: (), }
 
 impl Drop for X {
     fn drop(&mut self) {
-        error!("destructor runs");
+        error2!("destructor runs");
     }
 }
 
 fn main() {
     let x = Some((X { x: () }, X { x: () }));
     match x {
         Some((ref _y, _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => fail!()
+        None => fail2!()
     }
 }

branches/snap-stage3/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-3.rs

@@ -12,7 +12,7 @@ struct X { x: (), }
 
 impl Drop for X {
     fn drop(&mut self) {
-        error!("destructor runs");
+        error2!("destructor runs");
     }
 }
 
@@ -22,6 +22,6 @@ fn main() {
     let x = some2(X { x: () }, X { x: () });
     match x {
         some2(ref _y, _z) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        none2 => fail!()
+        none2 => fail2!()
     }
 }

branches/snap-stage3/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-4.rs

@@ -12,14 +12,14 @@ struct X { x: (), }
 
 impl Drop for X {
     fn drop(&mut self) {
-        error!("destructor runs");
+        error2!("destructor runs");
     }
 }
 
 fn main() {
     let x = Some((X { x: () }, X { x: () }));
     match x {
         Some((_y, ref _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => fail!()
+        None => fail2!()
     }
 }

branches/snap-stage3/src/test/compile-fail/bind-by-move-no-guards.rs

@@ -15,8 +15,8 @@ fn main() {
     let x = Some(p);
     c.send(false);
     match x {
-        Some(z) if z.recv() => { fail!() }, //~ ERROR cannot bind by-move into a pattern guard
+        Some(z) if z.recv() => { fail2!() }, //~ ERROR cannot bind by-move into a pattern guard
         Some(z) => { assert!(!z.recv()); },
-        None => fail!()
+        None => fail2!()
     }
 }

branches/snap-stage3/src/test/compile-fail/bind-by-move-no-sub-bindings.rs

@@ -12,14 +12,14 @@ struct X { x: (), }
 
 impl Drop for X {
     fn drop(&mut self) {
-        error!("destructor runs");
+        error2!("destructor runs");
     }
 }
 
 fn main() {
     let x = Some(X { x: () });
     match x {
         Some(_y @ ref _z) => { }, //~ ERROR cannot bind by-move with sub-bindings
-        None => fail!()
+        None => fail2!()
     }
 }

branches/snap-stage3/src/test/compile-fail/block-arg-as-stmt-with-value.rs

@@ -17,6 +17,6 @@ fn compute1() -> float {
 
 fn main() {
     let x = compute1();
-    info!(x);
+    info2!("{:?}", x);
     assert_eq!(x, -4f);
 }

branches/snap-stage3/src/test/compile-fail/block-coerce-no.rs

@@ -21,6 +21,6 @@ fn coerce(b: &fn()) -> extern fn() {
 
 fn main() {
     let i = 8;
-    let f = coerce(|| error!(i) );
+    let f = coerce(|| error2!("{:?}", i) );
     f();
 }

branches/snap-stage3/src/test/compile-fail/bogus-tag.rs

@@ -17,7 +17,7 @@ enum color { rgb(int, int, int), rgba(int, int, int, int), }
 fn main() {
     let red: color = rgb(255, 0, 0);
     match red {
-      rgb(r, g, b) => { info!("rgb"); }
-      hsl(h, s, l) => { info!("hsl"); }
+      rgb(r, g, b) => { info2!("rgb"); }
+      hsl(h, s, l) => { info2!("hsl"); }
     }
 }

branches/snap-stage3/src/test/compile-fail/borrowck-anon-fields-variant.rs

@@ -10,12 +10,12 @@ fn distinct_variant() {
 
     let a = match y {
       Y(ref mut a, _) => a,
-      X => fail!()
+      X => fail2!()
     };
 
     let b = match y {
       Y(_, ref mut b) => b,
-      X => fail!()
+      X => fail2!()
     };
 
     *a += 1;
@@ -27,12 +27,12 @@ fn same_variant() {
 
     let a = match y {
       Y(ref mut a, _) => a,
-      X => fail!()
+      X => fail2!()
     };
 
     let b = match y {
       Y(ref mut b, _) => b, //~ ERROR cannot borrow
-      X => fail!()
+      X => fail2!()
     };
 
     *a += 1;

branches/snap-stage3/src/test/compile-fail/borrowck-assign-comp-idx.rs

@@ -21,7 +21,7 @@ fn a() {
 
     p[0] = 5; //~ ERROR cannot assign
 
-    info!("%d", *q);
+    info2!("{}", *q);
 }
 
 fn borrow(_x: &[int], _f: &fn()) {}

branches/snap-stage3/src/test/compile-fail/borrowck-autoref-3261.rs

@@ -24,7 +24,7 @@ fn main() {
                 x = X(Left((0,0))); //~ ERROR cannot assign to `x`
                 (*f)()
             },
-            _ => fail!()
+            _ => fail2!()
         }
     }
 }

branches/snap-stage3/src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs

@@ -18,7 +18,7 @@ struct Bar {
   int2: int,
 }
 
-fn make_foo() -> ~Foo { fail!() }
+fn make_foo() -> ~Foo { fail2!() }
 
 fn borrow_same_field_twice_mut_mut() {
     let mut foo = make_foo();

branches/snap-stage3/src/test/compile-fail/borrowck-borrow-from-stack-variable.rs

@@ -18,7 +18,7 @@ struct Bar {
   int2: int,
 }
 
-fn make_foo() -> Foo { fail!() }
+fn make_foo() -> Foo { fail2!() }
 
 fn borrow_same_field_twice_mut_mut() {
     let mut foo = make_foo();

branches/snap-stage3/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs

@@ -16,7 +16,7 @@ struct defer<'self> {
 impl<'self> Drop for defer<'self> {
     fn drop(&mut self) {
         unsafe {
-            error!("%?", self.x);
+            error2!("{:?}", self.x);
         }
     }
 }

branches/snap-stage3/src/test/compile-fail/borrowck-lend-flow-if.rs

@@ -16,9 +16,9 @@
 
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
-fn cond() -> bool { fail!() }
-fn for_func(_f: &fn() -> bool) { fail!() }
-fn produce<T>() -> T { fail!(); }
+fn cond() -> bool { fail2!() }
+fn for_func(_f: &fn() -> bool) { fail2!() }
+fn produce<T>() -> T { fail2!(); }
 
 fn inc(v: &mut ~int) {
     *v = ~(**v + 1);

branches/snap-stage3/src/test/compile-fail/borrowck-lend-flow-loop.rs

@@ -16,8 +16,8 @@
 
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
-fn cond() -> bool { fail!() }
-fn produce<T>() -> T { fail!(); }
+fn cond() -> bool { fail2!() }
+fn produce<T>() -> T { fail2!(); }
 
 fn inc(v: &mut ~int) {
     *v = ~(**v + 1);

branches/snap-stage3/src/test/compile-fail/borrowck-lend-flow-match.rs

@@ -13,7 +13,7 @@
 #[allow(unused_variable)];
 #[allow(dead_assignment)];
 
-fn cond() -> bool { fail!() }
+fn cond() -> bool { fail2!() }
 fn link<'a>(v: &'a uint, w: &mut &'a uint) -> bool { *w = v; true }
 
 fn separate_arms() {

branches/snap-stage3/src/test/compile-fail/borrowck-lend-flow.rs

@@ -16,9 +16,9 @@
 
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
-fn cond() -> bool { fail!() }
-fn for_func(_f: &fn() -> bool) { fail!() }
-fn produce<T>() -> T { fail!(); }
+fn cond() -> bool { fail2!() }
+fn for_func(_f: &fn() -> bool) { fail2!() }
+fn produce<T>() -> T { fail2!(); }
 
 fn inc(v: &mut ~int) {
     *v = ~(**v + 1);

branches/snap-stage3/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs

@@ -18,14 +18,14 @@ fn box_imm() {
     let v = ~3;
     let _w = &v;
     do task::spawn {
-        info!("v=%d", *v);
+        info2!("v={}", *v);
         //~^ ERROR cannot move `v` into closure
     }
 
     let v = ~3;
     let _w = &v;
     task::spawn(|| {
-        info!("v=%d", *v);
+        info2!("v={}", *v);
         //~^ ERROR cannot move
     });
 }

branches/snap-stage3/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs

@@ -16,7 +16,7 @@ use std::either::{Either, Left, Right};
                 *x = Right(1.0);
                 *z
             }
-            _ => fail!()
+            _ => fail2!()
         }
     }
 

branches/snap-stage3/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs

@@ -23,7 +23,7 @@ pub fn main() {
                 }
             }
             let z = tail[0].clone();
-            info!(fmt!("%?", z));
+            info2!("{:?}", z);
         }
         _ => {
             unreachable!();

branches/snap-stage3/src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs

@@ -12,5 +12,5 @@ fn main() {
     let x: int = 3;
     let y: &mut int = &mut x; //~ ERROR cannot borrow
     *y = 5;
-    info!(*y);
+    info2!("{:?}", *y);
 }

branches/snap-stage3/src/test/compile-fail/borrowck-ref-into-rvalue.rs

@@ -14,7 +14,7 @@ fn main() {
         Some(ref m) => { //~ ERROR borrowed value does not live long enough
             msg = m;
         },
-        None => { fail!() }
+        None => { fail2!() }
     }
     println(*msg);
 }

branches/snap-stage3/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs

@@ -2,7 +2,7 @@ fn a() -> &[int] {
     let vec = ~[1, 2, 3, 4];
     let tail = match vec {
         [_, ..tail] => tail, //~ ERROR does not live long enough
-        _ => fail!("a")
+        _ => fail2!("a")
     };
     tail
 }
@@ -11,7 +11,7 @@ fn b() -> &[int] {
     let vec = ~[1, 2, 3, 4];
     let init = match vec {
         [..init, _] => init, //~ ERROR does not live long enough
-        _ => fail!("b")
+        _ => fail2!("b")
     };
     init
 }
@@ -20,7 +20,7 @@ fn c() -> &[int] {
     let vec = ~[1, 2, 3, 4];
     let slice = match vec {
         [_, ..slice, _] => slice, //~ ERROR does not live long enough
-        _ => fail!("c")
+        _ => fail2!("c")
     };
     slice
 }

branches/snap-stage3/src/test/compile-fail/borrowck-vec-pattern-nesting.rs

@@ -4,7 +4,7 @@ fn a() {
         [~ref _a] => {
             vec[0] = ~4; //~ ERROR cannot assign to `(*vec)[]` because it is borrowed
         }
-        _ => fail!("foo")
+        _ => fail2!("foo")
     }
 }
 

branches/snap-stage3/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs

@@ -2,7 +2,7 @@ fn a() -> &int {
     let vec = ~[1, 2, 3, 4];
     let tail = match vec {
         [_a, ..tail] => &tail[0], //~ ERROR borrowed value does not live long enough
-        _ => fail!("foo")
+        _ => fail2!("foo")
     };
     tail
 }