---

yaml
---
r: 171706
b: refs/heads/beta
c: 274146d
h: refs/heads/master
v: v3

Author: Jorge Aparicio

[refs]

@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 62ee3f1622183dfab2ed5894e9ab61deda416e9a
+refs/heads/beta: 274146d650e9c5ef476cb31bbc47e555ed4d359b
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/src/librustc_typeck/check/regionck.rs

@@ -1052,11 +1052,11 @@ fn constrain_callee(rcx: &mut Rcx,
     }
 }
 
-fn constrain_call<'a, I: Iterator<&'a ast::Expr>>(rcx: &mut Rcx,
-                                                  call_expr: &ast::Expr,
-                                                  receiver: Option<&ast::Expr>,
-                                                  mut arg_exprs: I,
-                                                  implicitly_ref_args: bool) {
+fn constrain_call<'a, I: Iterator<Item=&'a ast::Expr>>(rcx: &mut Rcx,
+                                                       call_expr: &ast::Expr,
+                                                       receiver: Option<&ast::Expr>,
+                                                       mut arg_exprs: I,
+                                                       implicitly_ref_args: bool) {
     //! Invoked on every call site (i.e., normal calls, method calls,
     //! and overloaded operators). Constrains the regions which appear
     //! in the type of the function. Also constrains the regions that

branches/beta/src/librustc_typeck/collect.rs

@@ -428,7 +428,7 @@ fn convert_methods<'a,'tcx,'i,I>(ccx: &CrateCtxt<'a, 'tcx>,
                                  untransformed_rcvr_ty: Ty<'tcx>,
                                  rcvr_ty_generics: &ty::Generics<'tcx>,
                                  rcvr_visibility: ast::Visibility)
-                                 where I: Iterator<&'i ast::Method> {
+                                 where I: Iterator<Item=&'i ast::Method> {
     debug!("convert_methods(untransformed_rcvr_ty={}, rcvr_ty_generics={})",
            untransformed_rcvr_ty.repr(ccx.tcx),
            rcvr_ty_generics.repr(ccx.tcx));