user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
bors 2013-05-30 16:04:47 -07:00
commit 308774e05b
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/middle/kind.rs
View file

@ -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 \

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

@ -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 {

2
src/test/compile-fail/kindck-owned-trait.rs
View file

@ -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 {