---

yaml
---
r: 159679
b: refs/heads/auto
c: e691192
h: refs/heads/master
i:
  159677: e7d188d
  159675: 5012ab3
  159671: 0841b23
  159663: 126b930
  159647: 0828ed5
  159615: 0a8b10a
v: v3

Author: nikomatsakis

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f8403aac81d5720bb722a85a9120c14ceb763eb9
+refs/heads/auto: e691192042c8505b79e55d7bbb0f3c4ebd2f7992
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/typeck/check/method/probe.rs

@@ -827,6 +827,32 @@ impl<'a,'tcx> ProbeContext<'a,'tcx> {
                method.fty.sig.inputs[0].repr(self.tcx()),
                substs.repr(self.tcx()));
 
+        // It is possible for type parameters or early-bound lifetimes
+        // to appear in the signature of `self`. The substitutions we
+        // are given do not include type/lifetime parameters for the
+        // method yet. So create fresh variables here for those too,
+        // if there are any.
+        assert_eq!(substs.types.len(subst::FnSpace), 0);
+        assert_eq!(substs.regions().len(subst::FnSpace), 0);
+        let mut substs = substs;
+        let placeholder;
+        if
+            !method.generics.types.is_empty_in(subst::FnSpace) ||
+            !method.generics.regions.is_empty_in(subst::FnSpace)
+        {
+            let method_types =
+                self.infcx().next_ty_vars(
+                    method.generics.types.len(subst::FnSpace));
+
+            let method_regions =
+                self.infcx().region_vars_for_defs(
+                    self.span,
+                    method.generics.regions.get_slice(subst::FnSpace));
+
+            placeholder = (*substs).clone().with_method(method_types, method_regions);
+            substs = &placeholder;
+        }
+
         let xform_self_ty = method.fty.sig.inputs[0].subst(self.tcx(), substs);
         self.infcx().replace_late_bound_regions_with_fresh_var(method.fty.sig.binder_id,
                                                                self.span,

branches/auto/src/test/run-pass/method-early-bound-lifetimes-on-self.rs

@@ -0,0 +1,34 @@
+// 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.
+
+// Check that we successfully handle methods where the `self` type has
+// an early-bound lifetime. Issue #18208.
+
+#![allow(dead_code)]
+
+struct Cursor<'a>;
+
+trait CursorNavigator {
+    fn init_cursor<'a, 'b:'a>(&'a self, cursor: &mut Cursor<'b>) -> bool;
+}
+
+struct SimpleNavigator;
+
+impl CursorNavigator for SimpleNavigator {
+    fn init_cursor<'a, 'b: 'a>(&'a self, _cursor: &mut Cursor<'b>) -> bool {
+        false
+    }
+}
+
+fn main() {
+    let mut c = Cursor;
+    let n = SimpleNavigator;
+    n.init_cursor(&mut c);
+}