Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use actual types for private readonly fields #278

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace AsmResolver.DotNet.Builder.Metadata.Blob
public class BlobStreamBuffer : IMetadataStreamBuffer
{
private readonly MemoryStream _rawStream = new();
private readonly IBinaryStreamWriter _writer;
private readonly BinaryStreamWriter _writer;
private readonly Dictionary<byte[], uint> _blobs = new(ByteArrayEqualityComparer.Instance);

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace AsmResolver.DotNet.Builder.Metadata.Guid
public class GuidStreamBuffer : IMetadataStreamBuffer
{
private readonly MemoryStream _rawStream = new();
private readonly IBinaryStreamWriter _writer;
private readonly BinaryStreamWriter _writer;
private readonly Dictionary<System.Guid, uint> _guids = new();

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace AsmResolver.DotNet.Builder.Metadata.UserStrings
public class UserStringsStreamBuffer : IMetadataStreamBuffer
{
private readonly MemoryStream _rawStream = new();
private readonly IBinaryStreamWriter _writer;
private readonly BinaryStreamWriter _writer;
private readonly Dictionary<string, uint> _strings = new();

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace AsmResolver.DotNet.Builder.Resources
public class DotNetResourcesDirectoryBuffer
{
private readonly MemoryStream _rawStream = new();
private readonly IBinaryStreamWriter _writer;
private readonly BinaryStreamWriter _writer;
private readonly Dictionary<byte[], uint> _dataOffsets = new(ByteArrayEqualityComparer.Instance);

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/AsmResolver.DotNet/Collections/ParameterCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace AsmResolver.DotNet.Collections
[DebuggerDisplay("Count = {" + nameof(Count) + "}")]
public class ParameterCollection : IReadOnlyList<Parameter>
{
private readonly IList<Parameter> _parameters = new List<Parameter>();
private readonly List<Parameter> _parameters = new List<Parameter>();
private readonly MethodDefinition _owner;
private bool _hasThis;

Expand Down
4 changes: 2 additions & 2 deletions src/AsmResolver.DotNet/DefaultMetadataResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace AsmResolver.DotNet
/// </summary>
public class DefaultMetadataResolver : IMetadataResolver
{
private readonly IDictionary<ITypeDescriptor, TypeDefinition> _typeCache;
private readonly ConcurrentDictionary<ITypeDescriptor, TypeDefinition> _typeCache;
private readonly SignatureComparer _comparer = new()
{
AcceptNewerAssemblyVersionNumbers = true
Expand Down Expand Up @@ -55,7 +55,7 @@ public IAssemblyResolver AssemblyResolver
// Check if type definition has changed since last lookup.
if (typeDef.IsTypeOf(type.Namespace, type.Name))
return typeDef;
_typeCache.Remove(type);
_typeCache.TryRemove(type, out _);
}

return null;
Expand Down
2 changes: 1 addition & 1 deletion src/AsmResolver.PE.File/SerializedPEFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace AsmResolver.PE.File
/// </summary>
public class SerializedPEFile : PEFile
{
private readonly IList<SectionHeader> _sectionHeaders;
private readonly List<SectionHeader> _sectionHeaders;
private readonly BinaryStreamReader _reader;

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/AsmResolver.PE.Win32Resources/Icon/IconResource.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;

Expand All @@ -12,7 +12,7 @@ public class IconResource : IWin32Resource
/// <summary>
/// Used to keep track of icon groups.
/// </summary>
private readonly IDictionary<uint, IconGroupDirectory> _entries = new Dictionary<uint, IconGroupDirectory>();
private readonly Dictionary<uint, IconGroupDirectory> _entries = new Dictionary<uint, IconGroupDirectory>();

/// <summary>
/// Obtains the icon group resources from the provided root win32 resources directory.
Expand Down
2 changes: 1 addition & 1 deletion src/AsmResolver.PE.Win32Resources/Version/StringTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static StringTable FromReader(ref BinaryStreamReader reader)
return new KeyValuePair<string, string>(header.Key, value);
}

private readonly IDictionary<string, string> _entries = new Dictionary<string, string>();
private readonly Dictionary<string, string> _entries = new Dictionary<string, string>();

/// <summary>
/// Creates a new string table.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private static VersionTableEntry ReadNextEntry(ref BinaryStreamReader reader)
}

private FixedVersionInfo _fixedVersionInfo = new FixedVersionInfo();
private readonly IDictionary<string, VersionTableEntry> _entries = new Dictionary<string, VersionTableEntry>();
private readonly Dictionary<string, VersionTableEntry> _entries = new Dictionary<string, VersionTableEntry>();

/// <inheritdoc />
public override string Key => VsVersionInfoKey;
Expand Down
2 changes: 1 addition & 1 deletion src/AsmResolver.PE/DotNet/Metadata/Tables/TablesStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class TablesStream : SegmentBase, IMetadataStream
/// </summary>
public const string UncompressedStreamName = "#Schema";

private readonly IDictionary<CodedIndex, IndexEncoder> _indexEncoders;
private readonly Dictionary<CodedIndex, IndexEncoder> _indexEncoders;
private readonly LazyVariable<IList<IMetadataTable>> _tables;
private readonly LazyVariable<IList<TableLayout>> _layouts;

Expand Down