Update region inference for traits so that a method with

explicit self doesn't incorrectly cause the entire trait to
be tagged as being region-parameterized.

Fixes #5224.

src/test/compile-fail/map-types.rs

@@ -17,5 +17,5 @@ fn main() {
     let x: @Map<~str, ~str> = @LinearMap::new::<~str, ~str>() as
         Map::<~str, ~str>;
     let y: @Map<uint, ~str> = @x;
-    //~^ ERROR mismatched types: expected `@core::container::Map/&<uint,~str>`
+    //~^ ERROR mismatched types: expected `@core::container::Map<uint,~str>`
 }

src/test/run-pass/regions-parameterization-self-types-issue-5224.rs

@@ -0,0 +1,28 @@
+// Test how region-parameterization inference
+// interacts with explicit self types.
+//
+// Issue #5224.
+
+trait Getter {
+    // This trait does not need to be
+    // region-parameterized, because 'self
+    // is bound in the self type:
+    fn get(&self) -> &'self int;
+}
+
+struct Foo {
+    field: int
+}
+
+impl Getter for Foo {
+    fn get(&self) -> &'self int { &self.field }
+}
+
+fn get_int<G: Getter>(g: &G) -> int {
+    *g.get()
+}
+
+fn main() {
+    let foo = Foo { field: 22 };
+    assert get_int(&foo) == 22;
+}