From 78b8d126db36fb031915e67a6498efd29b3438a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Wed, 23 Nov 2022 12:15:22 -0800
Subject: [PATCH] Fix rebase

---
 compiler/rustc_ast_lowering/src/expr.rs                    | 2 +-
 compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/rustc_ast_lowering/src/expr.rs b/compiler/rustc_ast_lowering/src/expr.rs
index 6215d9af370..3c217c0249a 100644
--- a/compiler/rustc_ast_lowering/src/expr.rs
+++ b/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),
diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
index 04bf4e04736..5c645c66cd7 100644
--- a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
+++ b/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()