Skip to content

Commit 32aae48

Browse files
committed
CSHARP=5572: Fix SelectMany after rebasing on main.
1 parent 9336fd8 commit 32aae48

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -499,20 +499,15 @@ obj is DictionarySerializerBase<TDictionary, TKey, TValue> other &&
499499
/// <inheritdoc/>
500500
public bool TryGetItemSerializationInfo(out BsonSerializationInfo serializationInfo)
501501
{
502-
if (_dictionaryRepresentation is DictionaryRepresentation.ArrayOfArrays or DictionaryRepresentation.ArrayOfDocuments)
503-
{
504-
var representation = _dictionaryRepresentation == DictionaryRepresentation.ArrayOfArrays
505-
? BsonType.Array
506-
: BsonType.Document;
507-
var keySerializer = _lazyKeySerializer.Value;
508-
var valueSerializer = _lazyValueSerializer.Value;
509-
var keyValuePairSerializer = new KeyValuePairSerializer<TKey, TValue>(representation, keySerializer, valueSerializer);
510-
serializationInfo = new BsonSerializationInfo(null, keyValuePairSerializer, keyValuePairSerializer.ValueType);
511-
return true;
512-
}
513-
514-
serializationInfo = null;
515-
return false;
502+
var representation = _dictionaryRepresentation == DictionaryRepresentation.ArrayOfArrays
503+
? BsonType.Array
504+
: BsonType.Document;
505+
var keySerializer = _lazyKeySerializer.Value;
506+
var valueSerializer = _lazyValueSerializer.Value;
507+
var keyValuePairSerializer = new KeyValuePairSerializer<TKey, TValue>(representation, keySerializer, valueSerializer);
508+
509+
serializationInfo = new BsonSerializationInfo(null, keyValuePairSerializer, keyValuePairSerializer.ValueType);
510+
return true;
516511
}
517512

518513
/// <inheritdoc/>

src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitor.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ internal partial class KnownSerializerFinderVisitor : ExpressionVisitor
2424
private bool _isMakingProgress = true;
2525
private readonly KnownSerializerMap _knownSerializers;
2626
private int _oldKnownSerializersCount = 0;
27-
private int _pass = 0;
2827
private readonly ExpressionTranslationOptions _translationOptions;
2928
private bool _useDefaultSerializerForConstants = false; // make as much progress as possible before setting this to true
3029

@@ -34,8 +33,6 @@ public KnownSerializerFinderVisitor(ExpressionTranslationOptions translationOpti
3433
_translationOptions = translationOptions;
3534
}
3635

37-
public int Pass => _pass;
38-
3936
public bool IsMakingProgress => _isMakingProgress;
4037

4138
public void EndPass()

0 commit comments

Comments
 (0)