Rollup merge of rust-lang#35532 - KiChjang:e0004-follow-up, r=jonathandturner

Do not span across nodes for E0004

Part of rust-lang#35233.
Fixes rust-lang#35529.

r? @arielb1

Author: Jonathan Turner

src/librustc_const_eval/check_match.rs

@@ -235,12 +235,7 @@ fn check_expr(cx: &mut MatchCheckCtxt, ex: &hir::Expr) {
                 .flat_map(|arm| &arm.0)
                 .map(|pat| vec![wrap_pat(cx, &pat)])
                 .collect();
-            let match_span = Span {
-                lo: ex.span.lo,
-                hi: scrut.span.hi,
-                expn_id: ex.span.expn_id
-            };
-            check_exhaustive(cx, match_span, &matrix, source);
+            check_exhaustive(cx, scrut.span, &matrix, source);
         },
         _ => ()
     }