Skip to content

Commit

Permalink
Fix #6069
Browse files Browse the repository at this point in the history
  • Loading branch information
Jules-Bertholet committed Feb 13, 2024
1 parent ead0fc9 commit d0c780f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1165,10 +1165,10 @@ pub(crate) fn format_trait(
result.push_str(&generics_str);

// FIXME(#2055): rustfmt fails to format when there are comments between trait bounds.
// Retrieve *unnormalized* ident (See #6069)
let source_ident = context.snippet(item.ident.span);
if !bounds.is_empty() {
let ident_hi = context
.snippet_provider
.span_after(item.span, item.ident.as_str());
let ident_hi = context.snippet_provider.span_after(item.span, source_ident);
let bound_hi = bounds.last().unwrap().span().hi();
let snippet = context.snippet(mk_sp(ident_hi, bound_hi));
if contains_comment(snippet) {
Expand Down
2 changes: 1 addition & 1 deletion tests/rustfmt/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ fn rustfmt_emits_error_on_line_overflow_true() {
#[test]
#[allow(non_snake_case)]
fn dont_emit_ICE() {
let files = ["tests/target/issue_5728.rs", "tests/target/issue_5729.rs"];
let files = ["tests/target/issue_5728.rs", "tests/target/issue_5729.rs", "tests/target/issue_6069.rs"];

for file in files {
let args = [file];
Expand Down
1 change: 1 addition & 0 deletions tests/target/issue_6069.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
trait Foó: Bar {}

0 comments on commit d0c780f

Please sign in to comment.