fixup! refactor extract_span_scope

Human9000-bit · Human9000-bit · commit b7c4d5b10dd7 · 2026-06-09T11:33:56.000Z
diff --git a/compiler/rustc_mir_build/src/builder/matches/mod.rs b/compiler/rustc_mir_build/src/builder/matches/mod.rs
@@ -2607,8 +2607,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             let span = arm.guard.map(|guard| self.thir[guard].span).unwrap_or(arm.span);
             (span, arm.scope)
         })
-        // FIXME(guard_patterns)
-        .unwrap_or_else(|| (sub_branch_span, self.local_scope()))
+        .unwrap_or_else(|| span_bug!(sub_branch_span, "guards are present, but the arm isn't"))
     }
 
     /// Append `AscribeUserType` statements onto the end of `block`

Original file line number	Diff line number	Diff line change
`@@ -2607,8 +2607,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {`
`2607`	`2607`	`let span = arm.guard.map(\|guard\| self.thir[guard].span).unwrap_or(arm.span);`
`2608`	`2608`	`(span, arm.scope)`
`2609`	`2609`	`})`
`2610`		`- // FIXME(guard_patterns)`
`2611`		`- .unwrap_or_else(\|\| (sub_branch_span, self.local_scope()))`
	`2610`	`+ .unwrap_or_else(\|\| span_bug!(sub_branch_span, "guards are present, but the arm isn't"))`
`2612`	`2611`	`}`
`2613`	`2612`
`2614`	`2613`	/// Append `AscribeUserType` statements onto the end of `block`