Remove hir::Guard

Use Expr instead. Use `ExprKind::Let` to represent if let guards.
2023-09-21 11:26:50 +00:00 · 2023-09-21 11:26:50 +00:00 · 407cb24142
commit 407cb24142
parent 5113ed28ea
17 changed files with 77 additions and 109 deletions
--- a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
+++ b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
@ -3590,7 +3590,7 @@ impl<'b, 'v> Visitor<'v> for ConditionVisitor<'b> {
                                ));
                            } else if let Some(guard) = &arm.guard {
                                self.errors.push((
-                                    arm.pat.span.to(guard.body().span),
+                                    arm.pat.span.to(guard.span),
                                    format!(
                                        "if this pattern and condition are matched, {} is not \
                                         initialized",