---

yaml
---
r: 151499
b: refs/heads/try2
c: b6c9dbd
h: refs/heads/master
i:
  151497: b172a9a
  151495: 0d500af
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: fa43727781833cfbc17e3161dc131b9c243e965f
+refs/heads/try2: b6c9dbd3e40e9de4a907ce5cb1e5d8ee0b5d6220
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/vtable.rs

@@ -733,7 +733,8 @@ pub fn early_resolve_expr(ex: &ast::Expr, fcx: &FnCtxt, is_early: bool) {
 pub fn resolve_impl(tcx: &ty::ctxt,
                     impl_item: &ast::Item,
                     impl_generics: &ty::Generics,
-                    impl_trait_ref: &ty::TraitRef) {
+                    impl_trait_ref: &ty::TraitRef)
+{
     let param_env = ty::construct_parameter_environment(
         tcx,
         None,
@@ -774,6 +775,7 @@ pub fn resolve_impl(tcx: &ty::ctxt,
         lookup_vtables_for_param(&vcx, impl_item.span, None,
                                  &param_bounds, t, false);
 
+    infcx.resolve_regions_and_report_errors();
 
     let res = impl_res {
         trait_vtables: vtbls,

branches/try2/src/test/compile-fail/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs

@@ -0,0 +1,41 @@
+// Copyright 2014 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.
+
+// Check that when we test the supertrait we ensure consistent use of
+// lifetime parameters. In this case, implementing T2<'a,'b> requires
+// an impl of T1<'a>, but we have an impl of T1<'b>.
+
+trait T1<'x> {
+    fn x(&self) -> &'x int;
+}
+
+trait T2<'x, 'y> : T1<'x> {
+    fn y(&self) -> &'y int;
+}
+
+struct S<'a, 'b> {
+    a: &'a int,
+    b: &'b int
+}
+
+impl<'a,'b> T1<'b> for S<'a, 'b> {
+    fn x(&self) -> &'b int {
+        self.b
+    }
+}
+
+impl<'a,'b> T2<'a, 'b> for S<'a, 'b> { //~ ERROR cannot infer an appropriate lifetime
+    fn y(&self) -> &'b int {
+        self.b
+    }
+}
+
+pub fn main() {
+}