Changes per comments and moved test cases files(1)

rust-lang · Mar 19, 2021 · bceaf18 · bceaf18
1 parent b63aeea
commit bceaf18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/formatting/items.rs b/src/formatting/items.rs
@@ -1204,13 +1204,9 @@ pub(crate) fn format_trait(
             }
             result.push_str(&where_clause_str);
         }
-        let pre_block_span = if !generics.where_clause.predicates.is_empty() {
-            mk_sp(generics.where_clause.span.hi(), item.span.hi())
-        } else if !generic_bounds.is_empty() {
-            mk_sp(generic_bounds.last().unwrap().span().hi(), item.span.hi())
-        } else {
-            item.span
-        };
+
+        /* Note: `where_clause` always exists; Span is empty when no where clause in the code */
+        let pre_block_span = mk_sp(generics.where_clause.span.hi(), item.span.hi());
         let pre_block_snippet = context.snippet(pre_block_span);
         if let Some(lo) = pre_block_snippet.find('/') {
             // 1 = `{`

diff --git a/...urce/lhs-to-rhs-bewteen-comments/trait.rs → ...urce/lhs-to-rhs-between-comments/trait.rs b/...urce/lhs-to-rhs-bewteen-comments/trait.rs → ...urce/lhs-to-rhs-between-comments/trait.rs
diff --git a/...rget/lhs-to-rhs-bewteen-comments/trait.rs → ...rget/lhs-to-rhs-between-comments/trait.rs b/...rget/lhs-to-rhs-bewteen-comments/trait.rs → ...rget/lhs-to-rhs-between-comments/trait.rs