Fix rebase

Author: estebank

src/librustc/hir/mod.rs

@@ -550,7 +550,7 @@ impl Generics {
 
     pub fn get_named(&self, name: &InternedString) -> Option<&GenericParam> {
         for param in &self.params {
-            if *name == param.name.name().as_interned_str() {
+            if *name == param.name.ident().as_interned_str() {
                 return Some(param);
             }
         }

src/test/ui/impl-trait/static-return-lifetime-infered.stderr

@@ -30,12 +30,12 @@ LL |         self.x.iter().map(|a| a.0)
    |         |
    |         ...but this borrow...
    |
-note: ...can't outlive the lifetime 'a as defined on the method body at 20:5
-  --> $DIR/static-return-lifetime-infered.rs:20:5
+note: ...can't outlive the lifetime 'a as defined on the method body at 20:20
+  --> $DIR/static-return-lifetime-infered.rs:20:20
    |
 LL |     fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the method body at 20:5
+   |                    ^^
+help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the method body at 20:20
    |
 LL |     fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> + 'a {
    |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^