diff options
| author | bors <bors@rust-lang.org> | 2013-03-29 00:03:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-29 00:03:48 -0700 |
| commit | 16445c5418e778a167ebacae22f058c03cba8ecb (patch) | |
| tree | 83daa4571a3219d611b76e2c14a0f5f8bb3f2aab | |
| parent | a985bc52cd3e65ee6693327eb728d34f477c0a12 (diff) | |
| parent | bf519dad6b4deeaeebb0c13a88e09f77758431a3 (diff) | |
| download | rust-16445c5418e778a167ebacae22f058c03cba8ecb.tar.gz rust-16445c5418e778a167ebacae22f058c03cba8ecb.zip | |
auto merge of #5617 : catamorphism/rust/issue-4335, r=catamorphism
| -rw-r--r-- | src/test/compile-fail/issue-4335.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/compile-fail/issue-4335.rs b/src/test/compile-fail/issue-4335.rs index ae147e628e4..5f907b35e41 100644 --- a/src/test/compile-fail/issue-4335.rs +++ b/src/test/compile-fail/issue-4335.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -8,10 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// xfail-test fn id<T>(t: T) -> T { t } -fn f<T>(v: &'r T) -> &'r fn()->T { id::<&'r fn()->T>(|| *v) } //~ ERROR ??? +fn f<'r, T>(v: &'r T) -> &'r fn()->T { id::<&'r fn()->T>(|| *v) } //~ ERROR cannot infer an appropriate lifetime due to conflicting requirements fn main() { let v = &5; |