Fix rebase

Author: estebank

compiler/rustc_ast_lowering/src/expr.rs

@@ -136,7 +136,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                         this.lower_block(body, false),
                         this.lower_label(*opt_label),
                         hir::LoopSource::Loop,
-                        this.lower_span(span),
+                        this.lower_span(*span),
                     )
                 }),
                 ExprKind::TryBlock(body) => self.lower_expr_try_block(body),

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -740,8 +740,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         if infcx
             .type_implements_trait(
                 tcx.lang_items().clone_trait().unwrap(),
-                tcx.erase_regions(ty),
-                ty::List::empty(),
+                [tcx.erase_regions(ty)],
                 self.param_env,
             )
             .must_apply_modulo_regions()