Add proper support for early/late distinction for lifetime bindings.
Uses newly added Vec::partition method to simplify resolve_lifetime.
This commit is contained in:
parent
586b619c76
commit
742e458102
20 changed files with 566 additions and 200 deletions
35
src/test/compile-fail/regions-early-bound-error-method.rs
Normal file
35
src/test/compile-fail/regions-early-bound-error-method.rs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Tests that you can use a fn lifetime parameter as part of
|
||||
// the value for a type parameter in a bound.
|
||||
|
||||
trait GetRef<'a> {
|
||||
fn get(&self) -> &'a int;
|
||||
}
|
||||
|
||||
struct Box<'a> {
|
||||
t: &'a int
|
||||
}
|
||||
|
||||
impl<'a> GetRef<'a> for Box<'a> {
|
||||
fn get(&self) -> &'a int {
|
||||
self.t
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Box<'a> {
|
||||
fn or<'b,G:GetRef<'b>>(&self, g2: G) -> &'a int {
|
||||
g2.get() //~ ERROR lifetime mismatch
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
}
|
||||
33
src/test/compile-fail/regions-early-bound-error.rs
Normal file
33
src/test/compile-fail/regions-early-bound-error.rs
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Tests that you can use a fn lifetime parameter as part of
|
||||
// the value for a type parameter in a bound.
|
||||
|
||||
trait GetRef<'a, T> {
|
||||
fn get(&self) -> &'a T;
|
||||
}
|
||||
|
||||
struct Box<'a, T> {
|
||||
t: &'a T
|
||||
}
|
||||
|
||||
impl<'a,T:Clone> GetRef<'a,T> for Box<'a,T> {
|
||||
fn get(&self) -> &'a T {
|
||||
self.t
|
||||
}
|
||||
}
|
||||
|
||||
fn get<'a,'b,G:GetRef<'a, int>>(g1: G, b: &'b int) -> &'b int {
|
||||
g1.get() //~ ERROR lifetime mismatch
|
||||
}
|
||||
|
||||
fn main() {
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Tests that you can use a fn lifetime parameter as part of
|
||||
// the value for a type parameter in a bound.
|
||||
|
||||
trait GetRef<'a> {
|
||||
fn get(&self) -> &'a int;
|
||||
}
|
||||
|
||||
struct Box<'a> {
|
||||
t: &'a int
|
||||
}
|
||||
|
||||
impl<'a> GetRef<'a> for Box<'a> {
|
||||
fn get(&self) -> &'a int {
|
||||
self.t
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Box<'a> {
|
||||
fn add<'b,G:GetRef<'b>>(&self, g2: G) -> int {
|
||||
*self.t + *g2.get()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
let b1 = Box { t: &3 };
|
||||
assert_eq!(b1.add(b1), 6);
|
||||
}
|
||||
35
src/test/run-pass/regions-early-bound-used-in-bound.rs
Normal file
35
src/test/run-pass/regions-early-bound-used-in-bound.rs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Tests that you can use a fn lifetime parameter as part of
|
||||
// the value for a type parameter in a bound.
|
||||
|
||||
trait GetRef<'a, T> {
|
||||
fn get(&self) -> &'a T;
|
||||
}
|
||||
|
||||
struct Box<'a, T> {
|
||||
t: &'a T
|
||||
}
|
||||
|
||||
impl<'a,T:Clone> GetRef<'a,T> for Box<'a,T> {
|
||||
fn get(&self) -> &'a T {
|
||||
self.t
|
||||
}
|
||||
}
|
||||
|
||||
fn add<'a,G:GetRef<'a, int>>(g1: G, g2: G) -> int {
|
||||
*g1.get() + *g2.get()
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
let b1 = Box { t: &3 };
|
||||
assert_eq!(add(b1, b1), 6);
|
||||
}
|
||||
35
src/test/run-pass/regions-early-bound-used-in-type-param.rs
Normal file
35
src/test/run-pass/regions-early-bound-used-in-type-param.rs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Tests that you can use a fn lifetime parameter as part of
|
||||
// the value for a type parameter in a bound.
|
||||
|
||||
trait Get<T> {
|
||||
fn get(&self) -> T;
|
||||
}
|
||||
|
||||
struct Box<T> {
|
||||
t: T
|
||||
}
|
||||
|
||||
impl<T:Clone> Get<T> for Box<T> {
|
||||
fn get(&self) -> T {
|
||||
self.t.clone()
|
||||
}
|
||||
}
|
||||
|
||||
fn add<'a,G:Get<&'a int>>(g1: G, g2: G) -> int {
|
||||
*g1.get() + *g2.get()
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
let b1 = Box { t: &3 };
|
||||
assert_eq!(add(b1, b1), 6);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue