Skip to content

Commit

Permalink
librustc: Resolve regions and report errors in trait/impl method
Browse files Browse the repository at this point in the history
matching.

This breaks code like:

    struct Foo<'a,'b> {
        x: &'a int,
        y: &'b int,
    }

    trait Tr {
        fn foo(x: Self) {}
    }

    impl<'a,'b> Tr for Foo<'a,'b> {
        fn foo(x: Foo<'b,'a>) {} // <-- bad
    }

Change this code to not contain a lifetime mismatch error. For example:

    struct Foo<'a,'b> {
        x: &'a int,
        y: &'b int,
    }

    trait Tr {
        fn foo(x: Self) {}
    }

    impl<'a,'b> Tr for Foo<'a,'b> {
        fn foo(x: Foo<'a,'b>) {} // OK
    }

Closes #15517.

[breaking-change]
  • Loading branch information
pcwalton committed Jul 25, 2014
1 parent 66a0b52 commit 5de8ed5
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/librustc/middle/typeck/check/mod.rs
Expand Up @@ -1076,6 +1076,10 @@ fn compare_impl_method(tcx: &ty::ctxt,
ty::note_and_explain_type_err(tcx, terr);
}
}

// Finally, resolve all regions. This catches wily misuses of lifetime
// parameters.
infcx.resolve_regions_and_report_errors();
}

fn check_cast(fcx: &FnCtxt,
Expand Down
30 changes: 30 additions & 0 deletions src/test/compile-fail/trait-matching-lifetimes.rs
@@ -0,0 +1,30 @@
// 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 the trait matching code takes lifetime parameters into account.
// (Issue #15517.)

struct Foo<'a,'b> {
x: &'a int,
y: &'b int,
}

trait Tr {
fn foo(x: Self) {}
}

impl<'a,'b> Tr for Foo<'a,'b> {
fn foo(x: Foo<'b,'a>) {
//~^ ERROR method not compatible with trait
//~^^ ERROR method not compatible with trait
}
}

fn main(){}

5 comments on commit 5de8ed5

@bors
Copy link
Contributor

@bors bors commented on 5de8ed5 Jul 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at pcwalton@5de8ed5

@bors
Copy link
Contributor

@bors bors commented on 5de8ed5 Jul 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging pcwalton/rust/resolve-regions-in-trait-matching = 5de8ed5 into auto

@bors
Copy link
Contributor

@bors bors commented on 5de8ed5 Jul 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pcwalton/rust/resolve-regions-in-trait-matching = 5de8ed5 merged ok, testing candidate = ee21b00

@bors
Copy link
Contributor

@bors bors commented on 5de8ed5 Jul 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ee21b00

Please sign in to comment.