Fix this PR with Imports & Dead Code Removal

Nexus-Mods · Nov 27, 2023 · dc63e98 · dc63e98
1 parent 130265c
commit dc63e98
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 259 deletions.
diff --git a/benchmarks/NexusMods.Benchmarks/Benchmarks/ChangeCase.cs b/benchmarks/NexusMods.Benchmarks/Benchmarks/ChangeCase.cs
diff --git a/benchmarks/NexusMods.Benchmarks/Benchmarks/ChangeCaseVsOrdinalIgnoreCase.cs b/benchmarks/NexusMods.Benchmarks/Benchmarks/ChangeCaseVsOrdinalIgnoreCase.cs
diff --git a/benchmarks/NexusMods.Benchmarks/Benchmarks/VectorisedStringHash.cs b/benchmarks/NexusMods.Benchmarks/Benchmarks/VectorisedStringHash.cs
diff --git a/src/Games/NexusMods.Games.StardewValley/Models/SMAPIVersion.cs b/src/Games/NexusMods.Games.StardewValley/Models/SMAPIVersion.cs
@@ -5,6 +5,7 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using NexusMods.Paths.Extensions;
+using Reloaded.Memory.Extensions;
 
 namespace NexusMods.Games.StardewValley.Models;
 

diff --git a/src/NexusMods.DataModel/ChunkedStreams/ChunkedStream.cs b/src/NexusMods.DataModel/ChunkedStreams/ChunkedStream.cs
@@ -1,5 +1,6 @@
 using System.Buffers;
 using NexusMods.Paths.Extensions;
+using Reloaded.Memory.Extensions;
 
 namespace NexusMods.DataModel.ChunkedStreams;
 
@@ -28,9 +29,7 @@ public ChunkedStream(T source, int capacity = 16)
     }
 
     /// <inheritdoc />
-    public override void Flush()
-    {
-    }
+    public override void Flush() { }
 
 
     /// <inheritdoc />
@@ -55,6 +54,7 @@ public override int Read(byte[] buffer, int offset, int count)
                 toRead = Math.Min(toRead, (int)lastChunkExtraSize);
             }
         }
+
         chunk.Slice((int)chunkOffset, toRead)
             .Span
             .CopyTo(buffer.AsSpan(offset, toRead));
@@ -64,7 +64,8 @@ public override int Read(byte[] buffer, int offset, int count)
 
 
     /// <inheritdoc />
-    public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = new CancellationToken())
+    public override async ValueTask<int> ReadAsync(Memory<byte> buffer,
+        CancellationToken cancellationToken = new CancellationToken())
     {
         if (_position >= _source.Size.Value)
         {
@@ -87,12 +88,12 @@ public override int Read(byte[] buffer, int offset, int count)
                 toRead = Math.Min(toRead, (int)lastChunkExtraSize);
             }
         }
+
         chunk.Slice((int)chunkOffset, toRead)
             .Span
             .CopyTo(buffer.Span.SliceFast(0, toRead));
         _position += (ulong)toRead;
         return toRead;
-
     }
 
     private async ValueTask<Memory<byte>> GetChunkAsync(ulong index, CancellationToken token)
@@ -101,6 +102,7 @@ private async ValueTask<Memory<byte>> GetChunkAsync(ulong index, CancellationTok
         {
             return memory!.Memory;
         }
+
         var memoryOwner = _pool.Rent((int)_source.ChunkSize.Value);
         await _source.ReadChunkAsync(memoryOwner.Memory, index, token);
         _cache.Add(index, memoryOwner);
@@ -113,6 +115,7 @@ private Memory<byte> GetChunk(ulong index)
         {
             return memory!.Memory;
         }
+
         var memoryOwner = _pool.Rent((int)_source.ChunkSize.Value);
         _source.ReadChunk(memoryOwner.Memory.Span, index);
         _cache.Add(index, memoryOwner);

diff --git a/src/NexusMods.DataModel/ChunkedStreams/LightweightLRUCache.cs b/src/NexusMods.DataModel/ChunkedStreams/LightweightLRUCache.cs
@@ -1,4 +1,5 @@
 using NexusMods.Paths.Extensions;
+using Reloaded.Memory.Extensions;
 
 namespace NexusMods.DataModel.ChunkedStreams;
 
@@ -45,6 +46,7 @@ public bool TryGet(TK key, out TV? value)
             Touch(index);
             return true;
         }
+
         value = default;
         return false;
     }
@@ -78,6 +80,7 @@ private readonly int Find(TK key)
         {
             if (_keys[i].Equals(key)) return i;
         }
+
         return -1;
     }
 

diff --git a/src/NexusMods.DataModel/Loadouts/Cursors/ModCursor.cs b/src/NexusMods.DataModel/Loadouts/Cursors/ModCursor.cs
@@ -1,5 +1,6 @@
 using NexusMods.DataModel.Interprocess;
 using NexusMods.Paths.Extensions;
+using Reloaded.Memory.Extensions;
 
 namespace NexusMods.DataModel.Loadouts.Cursors;
 

diff --git a/src/NexusMods.DataModel/Loadouts/DiskStateRegistry.cs b/src/NexusMods.DataModel/Loadouts/DiskStateRegistry.cs
@@ -4,6 +4,7 @@
 using NexusMods.DataModel.Abstractions;
 using NexusMods.DataModel.LoadoutSynchronizer;
 using NexusMods.Paths.Extensions;
+using Reloaded.Memory.Extensions;
 
 namespace NexusMods.DataModel.Loadouts;