Merge pull request #119 from rube200/master

Use goto default on switch
hadashiA · Jul 29, 2024 · fa9b2ba · fa9b2ba
2 parents aa786ee + 77d073a
commit fa9b2ba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/VYaml.Benchmark/VYaml.Benchmark.csproj b/VYaml.Benchmark/VYaml.Benchmark.csproj
@@ -11,7 +11,7 @@
     <ItemGroup>
       <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-      <PackageReference Include="System.Text.Json" Version="7.0.0" />
+      <PackageReference Include="System.Text.Json" Version="8.0.4" />
       <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>
 

diff --git a/VYaml.SourceGenerator/Emitter.cs b/VYaml.SourceGenerator/Emitter.cs
@@ -420,12 +420,7 @@ static bool TryEmitDeserializeMethod(
                             }
                             branching = "else if";
                         }
-                        using (codeWriter.BeginBlockScope("else"))
-                        {
-                            codeWriter.AppendLine("parser.Read(); // skip key");
-                            codeWriter.AppendLine("parser.SkipCurrentNode(); // skip value");
-                        }
-                        codeWriter.AppendLine("continue;");
+                        codeWriter.AppendLine("goto default;");
                     }
                 }
 

diff --git a/VYaml/Serialization/Formatters/InterfaceDictionaryFormatter.cs b/VYaml/Serialization/Formatters/InterfaceDictionaryFormatter.cs
@@ -5,7 +5,7 @@
 
 namespace VYaml.Serialization
 {
-    public class InterfaceDictionaryFormatter<TKey, TValue> : IYamlFormatter<IDictionary<TKey, TValue>?>
+    public class InterfaceDictionaryFormatter<TKey, TValue> : IYamlFormatter<IDictionary<TKey, TValue>?> where TKey : notnull
     {
         public void Serialize(ref Utf8YamlEmitter emitter, IDictionary<TKey, TValue>? value, YamlSerializationContext context)
         {