From 27071031543908ba594560bda58cf86ac2e33f1e Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Sun, 8 Oct 2023 17:24:25 -0500
Subject: [PATCH] fix: adjust span derivation for const generics

---
 src/items.rs               | 2 +-
 tests/source/issue-5935.rs | 9 +++++++++
 tests/target/issue-5935.rs | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/source/issue-5935.rs
 create mode 100644 tests/target/issue-5935.rs

diff --git a/src/items.rs b/src/items.rs
index 48c37df812c..c31d425af52 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -3244,7 +3244,7 @@ fn format_generics(
                     if brace_pos == BracePos::None {
                         span.hi()
                     } else {
-                        context.snippet_provider.span_before(span, "{")
+                        context.snippet_provider.span_before_last(span, "{")
                     },
                 ),
                 shape,
diff --git a/tests/source/issue-5935.rs b/tests/source/issue-5935.rs
new file mode 100644
index 00000000000..a1aac05627a
--- /dev/null
+++ b/tests/source/issue-5935.rs
@@ -0,0 +1,9 @@
+struct Regs<
+    const BEGIN: u64,
+    const END: u64,
+    const DIM: usize,
+    const N: usize = { (END - BEGIN) as usize / (8 * DIM) + 1 },
+>
+{
+    _foo: u64,
+}
\ No newline at end of file
diff --git a/tests/target/issue-5935.rs b/tests/target/issue-5935.rs
new file mode 100644
index 00000000000..ebc62c46466
--- /dev/null
+++ b/tests/target/issue-5935.rs
@@ -0,0 +1,8 @@
+struct Regs<
+    const BEGIN: u64,
+    const END: u64,
+    const DIM: usize,
+    const N: usize = { (END - BEGIN) as usize / (8 * DIM) + 1 },
+> {
+    _foo: u64,
+}