typecheck guard pattern conditions

max-niederman · max-niederman · commit 2ecce0bbdcc3 · 2024-09-21T21:09:51.000-07:00
diff --git a/compiler/rustc_hir_typeck/src/pat.rs b/compiler/rustc_hir_typeck/src/pat.rs
@@ -259,8 +259,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
`@@ -259,8 +259,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`259`	`259`	`PatKind::Struct(ref qpath, fields, has_rest_pat) => {`
`260`	`260`	`self.check_pat_struct(pat, qpath, fields, has_rest_pat, expected, pat_info)`
`261`	`261`	`}`
`262`		`- PatKind::Guard(pat, _) => {`
	`262`	`+ PatKind::Guard(pat, cond) => {`
`263`	`263`	`self.check_pat(pat, expected, pat_info);`
	`264`	`+ self.check_expr_has_type_or_error(cond, self.tcx.types.bool, \|_\| {});`
`264`	`265`	`expected`
`265`	`266`	`}`
`266`	`267`	`PatKind::Or(pats) => {`