mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use correct span for struct generics

Browse Source
This commit is contained in:
Caleb Cartwright 2023-02-15 22:24:03 -06:00 committed by Yacin Tmimi
parent 5391847ea5
commit 34f9ca28f2
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/items.rs
View File

@ -1278,7 +1278,7 @@ pub(crate) fn format_struct_struct(
let header_hi = struct_parts.ident.span.hi();
let body_lo = if let Some(generics) = struct_parts.generics {
// Adjust the span to start at the end of the generic arguments before searching for the '{'
let span = span.with_lo(generics.span.hi());
let span = span.with_lo(generics.where_clause.span.hi());
context.snippet_provider.span_after(span, "{")
} else {
context.snippet_provider.span_after(span, "{")

16
tests/target/issue_5691.rs Normal file
View File

@ -0,0 +1,16 @@
struct S<const C: usize>
where
[(); { num_slots!(C) }]:, {
/* An asterisk-based, or a double-slash-prefixed, comment here is
required to trigger the fmt bug.
A single-line triple-slash-prefixed comment (with a field following it) is not enough - it will not trigger the fmt bug.
Side note: If you have a combination of two, or all three of the
above mentioned types of comments here, some of them disappear
after `cargo fmt`.
The bug gets triggered even if a field definition following the
(asterisk-based, or a double-slash-prefixed) comment, too.
*/
}