From c30f2a421f4a835a04476d4c71e16e8f7fe90c34 Mon Sep 17 00:00:00 2001
From: lapla <me@lapla.dev>
Date: Sat, 19 Sep 2026 15:45:50 +0900
Subject: [PATCH] Use `end_point` for trailing brace in `let...else`
 diagnostics

---
 compiler/rustc_parse/src/parser/stmt.rs       |  4 +--
 tests/ui/parser/let-else-fullwidth-brace.rs   |  7 ++++++
 .../ui/parser/let-else-fullwidth-brace.stderr | 25 +++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 tests/ui/parser/let-else-fullwidth-brace.rs
 create mode 100644 tests/ui/parser/let-else-fullwidth-brace.stderr

diff --git a/compiler/rustc_parse/src/parser/stmt.rs b/compiler/rustc_parse/src/parser/stmt.rs
index 7c3752cfff187..df34a2864b48a 100644
--- a/compiler/rustc_parse/src/parser/stmt.rs
+++ b/compiler/rustc_parse/src/parser/stmt.rs
@@ -12,7 +12,7 @@ use rustc_ast::{
     LocalKind, MacCall, MacCallStmt, MacStmtStyle, Recovered, Stmt, StmtKind,
 };
 use rustc_errors::{Applicability, Diag, PResult};
-use rustc_span::{BytePos, ErrorGuaranteed, Ident, Span, kw, sym};
+use rustc_span::{ErrorGuaranteed, Ident, Span, kw, sym};
 use thin_vec::{ThinVec, thin_vec};
 
 use super::attr::InnerAttrForbiddenReason;
@@ -467,7 +467,7 @@ impl<'a> Parser<'a> {
                 ),
             };
             self.dcx().emit_err(diagnostics::InvalidCurlyInLetElse {
-                span: span.with_lo(span.hi() - BytePos(1)),
+                span: self.psess.source_map().end_point(span),
                 sugg,
             });
         }
diff --git a/tests/ui/parser/let-else-fullwidth-brace.rs b/tests/ui/parser/let-else-fullwidth-brace.rs
new file mode 100644
index 0000000000000..98bd65605faa8
--- /dev/null
+++ b/tests/ui/parser/let-else-fullwidth-brace.rs
@@ -0,0 +1,7 @@
+#![allow(irrefutable_let_patterns)]
+
+fn main() {
+    let x = {1｝ else { return; };
+    //~^ ERROR unknown start of token: \u{ff5d}
+    //~| ERROR right curly brace `}` before `else` in a `let...else` statement not allowed
+}
diff --git a/tests/ui/parser/let-else-fullwidth-brace.stderr b/tests/ui/parser/let-else-fullwidth-brace.stderr
new file mode 100644
index 0000000000000..a5bb4d029dbc5
--- /dev/null
+++ b/tests/ui/parser/let-else-fullwidth-brace.stderr
@@ -0,0 +1,25 @@
+error: unknown start of token: \u{ff5d}
+  --> $DIR/let-else-fullwidth-brace.rs:4:15
+   |
+LL |     let x = {1｝ else { return; };
+   |               ^^
+   |
+help: Unicode character '｝' (Fullwidth Right Curly Bracket) looks like '}' (Right Curly Brace), but it is not
+   |
+LL -     let x = {1｝ else { return; };
+LL +     let x = {1} else { return; };
+   |
+
+error: right curly brace `}` before `else` in a `let...else` statement not allowed
+  --> $DIR/let-else-fullwidth-brace.rs:4:15
+   |
+LL |     let x = {1｝ else { return; };
+   |               ^^
+   |
+help: wrap the expression in parentheses
+   |
+LL |     let x = ({1｝) else { return; };
+   |             +    +
+
+error: aborting due to 2 previous errors
+