auto merge of #6340 : graydon/rust/issue-2994, r=graydon

Author: bors

src/librustc/middle/kind.rs

@@ -421,7 +421,7 @@ pub fn check_durable(tcx: ty::ctxt, ty: ty::t, sp: span) -> bool {
         match ty::get(ty).sty {
           ty::ty_param(*) => {
             tcx.sess.span_err(sp, "value may contain borrowed \
-                                   pointers; use `'static` bound");
+                                   pointers; add `'static` bound");
           }
           _ => {
             tcx.sess.span_err(sp, "value may contain borrowed \

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

@@ -37,7 +37,7 @@ 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
     struct F<T> { f: T }
-    @F {f:t} as @foo //~ ERROR value may contain borrowed pointers; use `'static` bound
+    @F {f:t} as @foo //~ ERROR value may contain borrowed pointers; add `'static` bound
 }
 
 fn to_foo_3<T:Copy + 'static>(t: T) -> @foo {

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

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