Remove duplicate assignments

dotnet · Mar 30, 2024 · 576c426 · 576c426
1 parent 7734059
commit 576c426
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 14 deletions.
diff --git a/...on/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs b/...on/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs
@@ -48,7 +48,6 @@ protected internal override bool OnWriteResume(
             {
                 if (ShouldFlush(writer, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 
@@ -62,7 +61,6 @@ protected internal override bool OnWriteResume(
                 TValue element = enumerator.Current.Value;
                 if (!_valueConverter.TryWrite(writer, element, options, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 

diff --git a/...c/System/Text/Json/Serialization/Converters/Collection/DictionaryOfTKeyTValueConverter.cs b/...c/System/Text/Json/Serialization/Converters/Collection/DictionaryOfTKeyTValueConverter.cs
@@ -28,7 +28,7 @@ protected internal override bool OnWriteResume(
             JsonSerializerOptions options,
             ref WriteStack state)
         {
-            Dictionary<TKey, TValue>.Enumerator enumerator;
+            IEnumerator<KeyValuePair<TKey, TValue>> enumerator;
             if (state.Current.CollectionEnumerator == null)
             {
                 enumerator = value.GetEnumerator();
@@ -41,7 +41,7 @@ protected internal override bool OnWriteResume(
             }
             else
             {
-                enumerator = (Dictionary<TKey, TValue>.Enumerator)state.Current.CollectionEnumerator;
+                enumerator = (IEnumerator<KeyValuePair<TKey, TValue>>)state.Current.CollectionEnumerator;
             }
 
             JsonTypeInfo typeInfo = state.Current.JsonTypeInfo;
@@ -64,7 +64,6 @@ protected internal override bool OnWriteResume(
                 {
                     if (ShouldFlush(writer, ref state))
                     {
-                        state.Current.CollectionEnumerator = enumerator;
                         return false;
                     }
 
@@ -79,7 +78,6 @@ protected internal override bool OnWriteResume(
                     TValue element = enumerator.Current.Value;
                     if (!_valueConverter.TryWrite(writer, element, options, ref state))
                     {
-                        state.Current.CollectionEnumerator = enumerator;
                         return false;
                     }
 

diff --git a/...ext.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs b/...ext.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
@@ -63,7 +63,6 @@ protected internal override bool OnWriteResume(Utf8JsonWriter writer, TDictionar
             {
                 if (ShouldFlush(writer, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 
@@ -88,7 +87,6 @@ protected internal override bool OnWriteResume(Utf8JsonWriter writer, TDictionar
                 object? element = enumerator.Value;
                 if (!_valueConverter.TryWrite(writer, element, options, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 

diff --git a/...ext.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs b/...ext.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs
@@ -62,14 +62,12 @@ protected override bool OnWriteResume(
             {
                 if (ShouldFlush(writer, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 
                 object? element = enumerator.Current;
                 if (!converter.TryWrite(writer, element, options, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 

diff --git a/...n/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs b/...n/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs
@@ -40,14 +40,12 @@ protected override bool OnWriteResume(Utf8JsonWriter writer, TCollection value,
             {
                 if (ShouldFlush(writer, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 
                 TElement element = enumerator.Current;
                 if (!converter.TryWrite(writer, element, options, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 

diff --git a/...xt.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOrQueueConverter.cs b/...xt.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOrQueueConverter.cs
@@ -62,14 +62,12 @@ protected sealed override bool OnWriteResume(Utf8JsonWriter writer, TCollection
             {
                 if (ShouldFlush(writer, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }
 
                 object? element = enumerator.Current;
                 if (!converter.TryWrite(writer, element, options, ref state))
                 {
-                    state.Current.CollectionEnumerator = enumerator;
                     return false;
                 }