about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2022-12-26 12:47:08 -0800
committerEsteban Küber <esteban@kuber.com.ar>2022-12-26 12:47:08 -0800
commit2cc22cee968b008d81aeb05ba2bf93ec5dcd7177 (patch)
tree06d054cf72a3fe565f3ee99658ccebac9fc2880b
parent8bde5bbc07e94fd8d39c263f873c53131b617d24 (diff)
downloadrust-2cc22cee968b008d81aeb05ba2bf93ec5dcd7177.tar.gz
rust-2cc22cee968b008d81aeb05ba2bf93ec5dcd7177.zip
fix rebase
-rw-r--r--compiler/rustc_hir_typeck/src/demand.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_typeck/src/demand.rs b/compiler/rustc_hir_typeck/src/demand.rs
index 5afd2ad045e..0335c45a946 100644
--- a/compiler/rustc_hir_typeck/src/demand.rs
+++ b/compiler/rustc_hir_typeck/src/demand.rs
@@ -31,7 +31,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         expr_ty: Ty<'tcx>,
         expected: Ty<'tcx>,
         expected_ty_expr: Option<&'tcx hir::Expr<'tcx>>,
-        _error: Option<TypeError<'tcx>>,
+        error: Option<TypeError<'tcx>>,
     ) {
         if expr_ty == expected {
             return;