Merge pull request #1074 from rintaro/test-memorylayout-init

[NFC][Test] Simplify MemoryLayout dictionary initialization

Author: rintaro

Sources/SwiftSyntax/MemoryLayout.swift

@@ -23,6 +23,12 @@
       self.stride = stride
       self.alignment = alignment
     }
+    init<T>(_: T.Type) {
+      self.init(
+        size: MemoryLayout<T>.size,
+        stride: MemoryLayout<T>.stride,
+        alignment: MemoryLayout<T>.alignment)
+    }
   }
 
   public static var values: [String : Value] {

Sources/SwiftSyntax/Raw/RawSyntax.swift

@@ -791,25 +791,10 @@ extension RawSyntax {
 #if DEBUG
 /// See `SyntaxMemoryLayout`.
 var RawSyntaxDataMemoryLayouts: [String : SyntaxMemoryLayout.Value] = [
-  "RawSyntaxData": .init(
-    size: MemoryLayout<RawSyntaxData>.size,
-    stride: MemoryLayout<RawSyntaxData>.stride,
-    alignment: MemoryLayout<RawSyntaxData>.alignment),
-  "RawSyntaxData.Layout": .init(
-    size: MemoryLayout<RawSyntaxData.Layout>.size,
-    stride: MemoryLayout<RawSyntaxData.Layout>.stride,
-    alignment: MemoryLayout<RawSyntaxData.Layout>.alignment),
-  "RawSyntaxData.ParsedToken": .init(
-    size: MemoryLayout<RawSyntaxData.ParsedToken>.size,
-    stride: MemoryLayout<RawSyntaxData.ParsedToken>.stride,
-    alignment: MemoryLayout<RawSyntaxData.ParsedToken>.alignment),
-  "RawSyntaxData.MaterializedToken": .init(
-    size: MemoryLayout<RawSyntaxData.MaterializedToken>.size,
-    stride: MemoryLayout<RawSyntaxData.MaterializedToken>.stride,
-    alignment: MemoryLayout<RawSyntaxData.MaterializedToken>.alignment),
-  "RawSyntax?": .init(
-    size: MemoryLayout<RawSyntax?>.size,
-    stride: MemoryLayout<RawSyntax?>.stride,
-    alignment: MemoryLayout<RawSyntax?>.alignment),
+  "RawSyntaxData": .init(RawSyntaxData.self),
+  "RawSyntaxData.Layout": .init(RawSyntaxData.Layout.self),
+  "RawSyntaxData.ParsedToken": .init(RawSyntaxData.ParsedToken.self),
+  "RawSyntaxData.MaterializedToken": .init(RawSyntaxData.MaterializedToken.self),
+  "RawSyntax?": .init(RawSyntax?.self),
 ]
 #endif

Sources/SwiftSyntax/SyntaxData.swift

@@ -376,21 +376,9 @@ struct SyntaxData {
 #if DEBUG
 /// See `SyntaxMemoryLayout`.
 var SyntaxDataMemoryLayouts: [String : SyntaxMemoryLayout.Value] = [
-  "SyntaxData": .init(
-    size: MemoryLayout<SyntaxData>.size,
-    stride: MemoryLayout<SyntaxData>.stride,
-    alignment: MemoryLayout<SyntaxData>.alignment),
-  "SyntaxData.Info": .init(
-    size: MemoryLayout<SyntaxData.Info>.size,
-    stride: MemoryLayout<SyntaxData.Info>.stride,
-    alignment: MemoryLayout<SyntaxData.Info>.alignment),
-  "SyntaxData.Info.Root": .init(
-    size: MemoryLayout<SyntaxData.Info.Root>.size,
-    stride: MemoryLayout<SyntaxData.Info.Root>.stride,
-    alignment: MemoryLayout<SyntaxData.Info.Root>.alignment),
-  "SyntaxData.Info.NonRoot": .init(
-    size: MemoryLayout<SyntaxData.Info.NonRoot>.size,
-    stride: MemoryLayout<SyntaxData.Info.NonRoot>.stride,
-    alignment: MemoryLayout<SyntaxData.Info.NonRoot>.alignment),
+  "SyntaxData": .init(SyntaxData.self),
+  "SyntaxData.Info": .init(SyntaxData.Info.self),
+  "SyntaxData.Info.Root": .init(SyntaxData.Info.Root.self),
+  "SyntaxData.Info.NonRoot": .init(SyntaxData.Info.NonRoot.self),
 ]
 #endif