Merge branch 'master' into E0403-update-error-format

diff --cc src/librustc_resolve/lib.rs
index 8242bf97b11e0e81d5f718969d18c6c42f893406,65e14eee4bc2bc0fc0ec5e039c0cd920096355db..823005e9c5388b9e61e5a0a3a0e4dd08430be4a8
--- 1/src/librustc_resolve/lib.rs
--- 2/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@@ -1733,10 -1717,10 +1721,10 @@@ impl<'a> Resolver<'a> 
          where F: FnOnce(&mut Resolver)
      {
          match type_parameters {
-             HasTypeParameters(generics, space, rib_kind) => {
+             HasTypeParameters(generics, rib_kind) => {
                  let mut function_type_rib = Rib::new(rib_kind);
 -                let mut seen_bindings = HashSet::new();
 +                let mut seen_bindings = HashMap::new();
-                 for (index, type_parameter) in generics.ty_params.iter().enumerate() {
+                 for type_parameter in &generics.ty_params {
                      let name = type_parameter.ident.name;
                      debug!("with_type_parameter_rib: {}", type_parameter.id);