Skip to content

Commit 576c426

Browse files
committed
Remove duplicate assignments
1 parent 7734059 commit 576c426

File tree

6 files changed

+2
-14
lines changed

6 files changed

+2
-14
lines changed

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ protected internal override bool OnWriteResume(
4848
{
4949
if (ShouldFlush(writer, ref state))
5050
{
51-
state.Current.CollectionEnumerator = enumerator;
5251
return false;
5352
}
5453

@@ -62,7 +61,6 @@ protected internal override bool OnWriteResume(
6261
TValue element = enumerator.Current.Value;
6362
if (!_valueConverter.TryWrite(writer, element, options, ref state))
6463
{
65-
state.Current.CollectionEnumerator = enumerator;
6664
return false;
6765
}
6866

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfTKeyTValueConverter.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected internal override bool OnWriteResume(
2828
JsonSerializerOptions options,
2929
ref WriteStack state)
3030
{
31-
Dictionary<TKey, TValue>.Enumerator enumerator;
31+
IEnumerator<KeyValuePair<TKey, TValue>> enumerator;
3232
if (state.Current.CollectionEnumerator == null)
3333
{
3434
enumerator = value.GetEnumerator();
@@ -41,7 +41,7 @@ protected internal override bool OnWriteResume(
4141
}
4242
else
4343
{
44-
enumerator = (Dictionary<TKey, TValue>.Enumerator)state.Current.CollectionEnumerator;
44+
enumerator = (IEnumerator<KeyValuePair<TKey, TValue>>)state.Current.CollectionEnumerator;
4545
}
4646

4747
JsonTypeInfo typeInfo = state.Current.JsonTypeInfo;
@@ -64,7 +64,6 @@ protected internal override bool OnWriteResume(
6464
{
6565
if (ShouldFlush(writer, ref state))
6666
{
67-
state.Current.CollectionEnumerator = enumerator;
6867
return false;
6968
}
7069

@@ -79,7 +78,6 @@ protected internal override bool OnWriteResume(
7978
TValue element = enumerator.Current.Value;
8079
if (!_valueConverter.TryWrite(writer, element, options, ref state))
8180
{
82-
state.Current.CollectionEnumerator = enumerator;
8381
return false;
8482
}
8583

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ protected internal override bool OnWriteResume(Utf8JsonWriter writer, TDictionar
6363
{
6464
if (ShouldFlush(writer, ref state))
6565
{
66-
state.Current.CollectionEnumerator = enumerator;
6766
return false;
6867
}
6968

@@ -88,7 +87,6 @@ protected internal override bool OnWriteResume(Utf8JsonWriter writer, TDictionar
8887
object? element = enumerator.Value;
8988
if (!_valueConverter.TryWrite(writer, element, options, ref state))
9089
{
91-
state.Current.CollectionEnumerator = enumerator;
9290
return false;
9391
}
9492

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@ protected override bool OnWriteResume(
6262
{
6363
if (ShouldFlush(writer, ref state))
6464
{
65-
state.Current.CollectionEnumerator = enumerator;
6665
return false;
6766
}
6867

6968
object? element = enumerator.Current;
7069
if (!converter.TryWrite(writer, element, options, ref state))
7170
{
72-
state.Current.CollectionEnumerator = enumerator;
7371
return false;
7472
}
7573

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,12 @@ protected override bool OnWriteResume(Utf8JsonWriter writer, TCollection value,
4040
{
4141
if (ShouldFlush(writer, ref state))
4242
{
43-
state.Current.CollectionEnumerator = enumerator;
4443
return false;
4544
}
4645

4746
TElement element = enumerator.Current;
4847
if (!converter.TryWrite(writer, element, options, ref state))
4948
{
50-
state.Current.CollectionEnumerator = enumerator;
5149
return false;
5250
}
5351

src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOrQueueConverter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@ protected sealed override bool OnWriteResume(Utf8JsonWriter writer, TCollection
6262
{
6363
if (ShouldFlush(writer, ref state))
6464
{
65-
state.Current.CollectionEnumerator = enumerator;
6665
return false;
6766
}
6867

6968
object? element = enumerator.Current;
7069
if (!converter.TryWrite(writer, element, options, ref state))
7170
{
72-
state.Current.CollectionEnumerator = enumerator;
7371
return false;
7472
}
7573

0 commit comments

Comments
 (0)