fix: match the standard Rust formatting && use .kind() instead of iter

Author: wasd96040501

crates/hir/src/display.rs

@@ -1,6 +1,6 @@
 //! HirDisplay implementations for various hir types.
 use hir_def::{
-    data::adt::VariantData,
+    data::adt::{StructKind, VariantData},
     generics::{
         TypeOrConstParamData, TypeParamProvenance, WherePredicate, WherePredicateTypeTarget,
     },
@@ -164,12 +164,9 @@ impl HirDisplay for Struct {
         let def_id = GenericDefId::AdtId(AdtId::StructId(self.id));
         write_generic_params(def_id, f)?;
 
-        let field_is_tuple_index =
-            self.variant_data(f.db).fields().iter().any(|(_, f)| f.name.as_tuple_index().is_some());
-
-        if field_is_tuple_index {
+        let variant_data = self.variant_data(f.db);
+        if let StructKind::Tuple = variant_data.kind() {
             f.write_char('(')?;
-            let variant_data = self.variant_data(f.db);
             let mut it = variant_data.fields().iter().peekable();
 
             while let Some((id, _)) = it.next() {
@@ -188,7 +185,7 @@ impl HirDisplay for Struct {
 
         let fields = self.fields(f.db);
         if !fields.is_empty() {
-            f.write_str("\n{\n")?;
+            f.write_str(" {\n")?;
             for field in self.fields(f.db) {
                 f.write_str("    ")?;
                 field.hir_fmt(f)?;
@@ -212,7 +209,7 @@ impl HirDisplay for Enum {
 
         let variants = self.variants(f.db);
         if !variants.is_empty() {
-            f.write_str("\n{\n")?;
+            f.write_str(" {\n")?;
             for variant in variants {
                 f.write_str("    ")?;
                 variant.hir_fmt(f)?;
@@ -240,7 +237,7 @@ impl HirDisplay for Union {
             for field in self.fields(f.db) {
                 f.write_str("    ")?;
                 field.hir_fmt(f)?;
-                f.write_char('\n')?;
+                f.write_str(",\n")?;
             }
             f.write_str("}")?;
         }

crates/ide/src/hover/tests.rs

@@ -1136,8 +1136,7 @@ impl Thing {
                 ```
 
                 ```rust
-                struct Thing
-                {
+                struct Thing {
                     x: u32,
                 }
                 ```
@@ -1158,8 +1157,7 @@ impl Thing {
                 ```
 
                 ```rust
-                struct Thing
-                {
+                struct Thing {
                     x: u32,
                 }
                 ```
@@ -1180,8 +1178,7 @@ impl Thing {
                 ```
 
                 ```rust
-                enum Thing
-                {
+                enum Thing {
                     A,
                 }
                 ```
@@ -1202,8 +1199,7 @@ impl Thing {
                 ```
 
                 ```rust
-                enum Thing
-                {
+                enum Thing {
                     A,
                 }
                 ```
@@ -2017,8 +2013,7 @@ fn test_hover_layout_of_enum() {
             ```
 
             ```rust
-            enum Foo
-            {
+            enum Foo {
                 Variant1(u8, u16),
                 Variant2(i32, u8, i64),
             } // size = 16 (0x10), align = 8, niches = 254
@@ -2362,7 +2357,7 @@ fn main() { let s$0t = S{ f1:0 }; }
                                     focus_range: 7..8,
                                     name: "S",
                                     kind: Struct,
-                                    description: "struct S\n{\n    f1: u32,\n}",
+                                    description: "struct S {\n    f1: u32,\n}",
                                 },
                             },
                         ],
@@ -2395,7 +2390,7 @@ fn main() { let s$0t = S{ f1:Arg(0) }; }
                                     focus_range: 24..25,
                                     name: "S",
                                     kind: Struct,
-                                    description: "struct S<T>\n{\n    f1: T,\n}",
+                                    description: "struct S<T> {\n    f1: T,\n}",
                                 },
                             },
                             HoverGotoTypeData {
@@ -2454,7 +2449,7 @@ fn main() { let s$0t = S{ f1: S{ f1: Arg(0) } }; }
                                     focus_range: 24..25,
                                     name: "S",
                                     kind: Struct,
-                                    description: "struct S<T>\n{\n    f1: T,\n}",
+                                    description: "struct S<T> {\n    f1: T,\n}",
                                 },
                             },
                             HoverGotoTypeData {