---

yaml
---
r: 38383
b: refs/heads/try
c: 89ed595
h: refs/heads/master
i:
  38381: fad922c
  38379: 1a0fad9
  38375: 98e7ef7
  38367: d1fb349
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 8a687dd8e428ac301fabe8110bcd3b630a78ad46
+refs/heads/try: 89ed595e306a7f391b561ee8a5a1e7aca24bf534
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/compile-fail/access-mode-in-closures.rs

@@ -1,9 +1,9 @@
 enum sty = ~[int];
 
-fn unpack(unpack: &fn(v: &sty) -> ~[int]) {}
+fn unpack(_unpack: &fn(v: &sty) -> ~[int]) {}
 
 fn main() {
-    let foo = unpack(|s| {
+    let _foo = unpack(|s| {
         // Test that `s` is moved here.
         match *s { sty(v) => v } //~ ERROR moving out of dereference of immutable & pointer
     });

branches/try/src/test/compile-fail/issue-2548.rs

@@ -32,9 +32,9 @@ fn main() {
 
     {
         let mut res = foo(x);
-        
+
         let mut v = ~[mut];
-        v = move ~[mut (move res)] + v; //~ ERROR instantiating a type parameter with an incompatible type (needs `copy`, got `durable`, missing `copy`)
+        v = move ~[mut (move res)] + v; //~ ERROR instantiating a type parameter with an incompatible type (needs `copy`, got `&static`, missing `copy`)
         assert (v.len() == 2);
     }
 

branches/try/src/test/compile-fail/kindck-owned-trait-scoped.rs

@@ -32,7 +32,7 @@ fn to_foo<T:Copy>(t: T) {
 fn to_foo_2<T:Copy>(t: T) -> foo {
     // Not OK---T may contain borrowed ptrs and it is going to escape
     // as part of the returned foo value
-    {f:t} as foo //~ ERROR value may contain borrowed pointers; use `durable` bound
+    {f:t} as foo //~ ERROR value may contain borrowed pointers; use `&static` bound
 }
 
 fn to_foo_3<T:Copy &static>(t: T) -> foo {

branches/try/src/test/compile-fail/kindck-owned-trait.rs

@@ -11,7 +11,7 @@
 trait foo { fn foo(); }
 
 fn to_foo<T: Copy foo>(t: T) -> foo {
-    t as foo //~ ERROR value may contain borrowed pointers; use `durable` bound
+    t as foo //~ ERROR value may contain borrowed pointers; use `&static` bound
 }
 
 fn to_foo2<T: Copy foo &static>(t: T) -> foo {

branches/try/src/test/compile-fail/kindck-owned.rs

@@ -18,12 +18,12 @@ fn copy2<T: Copy &static>(t: T) -> fn@() -> T {
 
 fn main() {
     let x = &3;
-    copy2(&x); //~ ERROR missing `durable`
+    copy2(&x); //~ ERROR missing `&static`
 
     copy2(@3);
-    copy2(@&x); //~ ERROR missing `durable`
+    copy2(@&x); //~ ERROR missing `&static`
 
     copy2(fn@() {});
     copy2(fn~() {}); //~ WARNING instantiating copy type parameter with a not implicitly copyable type
-    copy2(fn&() {}); //~ ERROR missing `copy durable`
+    copy2(fn&() {}); //~ ERROR missing `copy &static`
 }