- PR comments

Author: BorisDog

src/MongoDB.Bson/IO/ReadOnlyMemoryBsonReader.cs

@@ -447,7 +447,7 @@ public override ObjectId ReadObjectId()
     }
 
     /// <summary>
-    /// Reads a raw BSON array. WARNING TODO
+    /// Reads a raw BSON array.
     /// </summary>
     /// <returns>
     /// The raw BSON array.
@@ -656,7 +656,7 @@ private void PopContext()
             throw new FormatException($"Expected size to be {_context.Size}, not {actualSize}.");
         }
 
-        _context =_contextStack.Pop();
+        _context = _contextStack.Pop();
     }
 
     private void PushContext(BsonBinaryReaderContext newContext)

src/MongoDB.Bson/IO/TrieNameDecoder.cs

@@ -104,14 +104,11 @@ public string Decode(BsonStream stream, UTF8Encoding encoding)
         public string Decode(ReadOnlySpan<byte> span, UTF8Encoding encoding)
         {
             BsonTrieNode<TValue> node;
-            if (_trie.TryGetNode(span, out node))
+            if (_trie.TryGetNode(span, out node) && node.HasValue)
             {
-                if (node.HasValue)
-                {
-                    _found = true;
-                    _value = node.Value;
-                    return node.ElementName;
-                }
+                _found = true;
+                _value = node.Value;
+                return node.ElementName;
             }
 
             _found = false;

src/MongoDB.Bson/ObjectModel/RawBsonDocument.cs

@@ -69,7 +69,6 @@ public override int ElementCount
             {
                 ThrowIfDisposed();
                 using var bsonReader = BsonBinaryReaderUtils.CreateBinaryReader(_slice, _readerSettings);
-                var context = BsonDeserializationContext.CreateRoot(bsonReader);
 
                 var elementCount = 0;