---

yaml
---
r: 36782
b: refs/heads/try2
c: 02e804b
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: fe9294ef71a36a7d63a1d9fff07cf5601864869a
+refs/heads/try2: 02e804bba8e2e82e6e2112ceb297ffb237b42ea6
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/test/run-pass/borrowck-preserve-box-in-arm-not-taken.rs

@@ -13,7 +13,7 @@
 fn main() {
     let x: @mut @Option<~int> = @mut @None;
     match x {
-      @@Some(y) => {
+      @@Some(ref y) => {
         // here, the refcount of `*x` is bumped so
         // `y` remains valid even if `*x` is modified.
         *x = @None;
@@ -24,4 +24,4 @@ fn main() {
         // works.
       }
     }
-}
+}

branches/try2/src/test/run-pass/boxed-trait-with-vstore.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 trait Foo {
-    fn foo() {}
+    fn foo();
 }
 
 impl int : Foo {

branches/try2/src/test/run-pass/default-method-simple.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait Foo {
     fn f() {
         io::println("Hello!");

branches/try2/src/test/run-pass/issue-2718.rs

@@ -220,7 +220,7 @@ mod pingpong {
 
     fn liberate_ping(-p: ping) -> pipes::send_packet<pong> unsafe {
         let addr : *pipes::send_packet<pong> = match &p {
-          &ping(x) => { cast::transmute(ptr::addr_of(&x)) }
+          &ping(ref x) => { cast::transmute(ptr::addr_of(x)) }
         };
         let liberated_value = move *addr;
         cast::forget(move p);
@@ -229,7 +229,7 @@ mod pingpong {
 
     fn liberate_pong(-p: pong) -> pipes::send_packet<ping> unsafe {
         let addr : *pipes::send_packet<ping> = match &p {
-          &pong(x) => { cast::transmute(ptr::addr_of(&x)) }
+          &pong(ref x) => { cast::transmute(ptr::addr_of(x)) }
         };
         let liberated_value = move *addr;
         cast::forget(move p);

branches/try2/src/test/run-pass/issue-3683.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait Foo {
     fn a() -> int;
     fn b() -> int {

branches/try2/src/test/run-pass/trait-default-method-bound-subst3.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait A {
     fn g<T>(x: T, y: T) -> (T, T) { (move x, move y) }
 }

branches/try2/src/test/run-pass/trait-default-method-bound-subst4.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait A<T> {
     fn g(x: uint) -> uint { move x }
 }

branches/try2/src/test/run-pass/trait-default-method-bound.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait A {
     fn g() -> int { 10 }
 }

branches/try2/src/test/run-pass/traits-default-method-macro.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait Foo {
     fn bar() -> ~str {
         fmt!("test")
@@ -24,4 +26,4 @@ impl Baz: Foo {
 fn main() {
     let q = Quux;
     assert q.bar() == ~"test";
-}
+}

branches/try2/src/test/run-pass/traits-default-method-trivial.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[allow(default_methods)];
+
 trait Cat {
     fn meow() -> bool;
     fn scratch() -> bool;