typecheck guard pattern conditions

max-niederman · max-niederman · commit 087b8721dbaa · 2024-12-31T17:32:46.000-08:00
diff --git a/compiler/rustc_hir_typeck/src/pat.rs b/compiler/rustc_hir_typeck/src/pat.rs
@@ -284,8 +284,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             PatKind::Struct(ref qpath, fields, has_rest_pat) => {
                 self.check_pat_struct(pat, qpath, fields, has_rest_pat, expected, pat_info)
             }
-            PatKind::Guard(pat, _) => {
+            PatKind::Guard(pat, cond) => {
                 self.check_pat(pat, expected, pat_info);
+                self.check_expr_has_type_or_error(cond, self.tcx.types.bool, |_| {});
                 expected
             }
             PatKind::Or(pats) => {

Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`284`	`284`	`PatKind::Struct(ref qpath, fields, has_rest_pat) => {`
`285`	`285`	`self.check_pat_struct(pat, qpath, fields, has_rest_pat, expected, pat_info)`
`286`	`286`	`}`
`287`		`- PatKind::Guard(pat, _) => {`
	`287`	`+ PatKind::Guard(pat, cond) => {`
`288`	`288`	`self.check_pat(pat, expected, pat_info);`
	`289`	`+ self.check_expr_has_type_or_error(cond, self.tcx.types.bool, \|_\| {});`
`289`	`290`	`expected`
`290`	`291`	`}`
`291`	`292`	`PatKind::Or(pats) => {`