Skip to content

Refactor: var consistency, guard ordering, and other style improvements #118

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.

Sign up for GitHub

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

Merged
Tyrrrz merged 13 commits into from
Apr 17, 2026
Merged

Refactor: var consistency, guard ordering, and other style improvements #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
875a676
Fix #if guard order, add explanatory comments on nested guards, fix t…
Copilot Apr 17, 2026
e8edcf9
Replace explicit-type local variable declarations with var
Copilot Apr 17, 2026
fe12c8f
Update ITimer.cs
Tyrrrz Apr 17, 2026
05bcc86
Update TimeProvider.cs
Tyrrrz Apr 17, 2026
0202bf2
Update Stream.cs
Tyrrrz Apr 17, 2026
7cd07f5
Replace remaining explicit types with var+cast and use target-typed n…
Copilot Apr 17, 2026
ca2e378
Update TextWriter.cs
Tyrrrz Apr 17, 2026
223d83c
Update Timer.cs
Tyrrrz Apr 17, 2026
85dada7
Merge remote-tracking branch 'origin/prime' into copilot/refactor-con…
Copilot Apr 17, 2026
9b87704
Address review feedback: standardize comments and fix Process.cs guar…
Copilot Apr 17, 2026
8c4b8c8
Update Process.cs
Tyrrrz Apr 17, 2026
0086dd7
Fix build: restore FEATURE_TASK guard in Timer.cs, fix ITimer.cs form…
Copilot Apr 17, 2026
6b30dd3
Fix format
Tyrrrz Apr 17, 2026
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
6 changes: 3 additions & 3 deletions PolyShim.Tests/Net50/InterlockedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ public void Or_Test()
i.Should().Be(unchecked((int)0xFFFFFFFF));

// uint
uint ui = 0x0000FFFF;
var ui = (uint)0x0000FFFF;
Interlocked.Or(ref ui, 0xFFFF0000).Should().Be(0x0000FFFF);
ui.Should().Be(0xFFFFFFFF);

// long
long l = 0x00000000FFFFFFFF;
var l = (long)0x00000000FFFFFFFF;
Interlocked.Or(ref l, unchecked((long)0xFFFFFFFF00000000)).Should().Be(0x00000000FFFFFFFF);
l.Should().Be(unchecked((long)0xFFFFFFFFFFFFFFFF));

// ulong
ulong ul = 0x00000000FFFFFFFF;
var ul = (ulong)0x00000000FFFFFFFF;
Interlocked.Or(ref ul, 0xFFFFFFFF00000000).Should().Be(0x00000000FFFFFFFF);
ul.Should().Be(0xFFFFFFFFFFFFFFFF);
}
Expand Down
6 changes: 3 additions & 3 deletions PolyShim.Tests/Net80/RandomTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void GetItems_Span_Test()
{
// Arrange
var random = new Random(0);
ReadOnlySpan<int> choices = [1, 2, 3, 4, 5];
var choices = (ReadOnlySpan<int>)[1, 2, 3, 4, 5];

for (var i = 0; i < 100; i++)
{
Expand All @@ -55,8 +55,8 @@ public void GetItems_SpanDestination_Test()
{
// Arrange
var random = new Random(0);
ReadOnlySpan<int> choices = [1, 2, 3, 4, 5];
Span<int> destination = new int[3];
var choices = (ReadOnlySpan<int>)[1, 2, 3, 4, 5];
var destination = (Span<int>)new int[3];

for (var i = 0; i < 100; i++)
{
Expand Down
4 changes: 2 additions & 2 deletions PolyShim.Tests/Net90/FileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void AppendAllBytes_Span_Test()
File.WriteAllBytes(tempFilePath, [0x00, 0x01, 0x02]);

// Act
ReadOnlySpan<byte> bytes = [0x0A, 0x0B, 0x0C];
var bytes = (ReadOnlySpan<byte>)[0x0A, 0x0B, 0x0C];
File.AppendAllBytes(tempFilePath, bytes);

// Assert
Expand Down Expand Up @@ -90,7 +90,7 @@ public async Task AppendAllBytesAsync_Memory_Test()
await File.WriteAllBytesAsync(tempFilePath, [0x00, 0x01, 0x02]);

// Act
ReadOnlyMemory<byte> bytes = new byte[] { 0x0A, 0x0B, 0x0C };
var bytes = (ReadOnlyMemory<byte>)new byte[] { 0x0A, 0x0B, 0x0C };
await File.AppendAllBytesAsync(tempFilePath, bytes);

// Assert
Expand Down
34 changes: 17 additions & 17 deletions PolyShim.Tests/NetCore21/MemoryExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void Array_CopyTo_Span_Test()
{
// Arrange
var array = new[] { 1, 2, 3 };
Span<int> destination = new int[3];
var destination = (Span<int>)new int[3];

// Act
array.CopyTo(destination);
Expand All @@ -104,7 +104,7 @@ public void Array_CopyTo_Memory_Test()
{
// Arrange
var array = new[] { 1, 2, 3 };
Memory<int> destination = new int[3];
var destination = (Memory<int>)new int[3];

// Act
array.CopyTo(destination);
Expand Down Expand Up @@ -190,7 +190,7 @@ public void String_AsMemory_Start_Length_Test()
public void Span_IndexOf_Found_Test()
{
// Arrange
Span<int> span = [10, 20, 30, 40, 50];
var span = (Span<int>)[10, 20, 30, 40, 50];

// Act & Assert
span.IndexOf(30).Should().Be(2);
Expand All @@ -200,7 +200,7 @@ public void Span_IndexOf_Found_Test()
public void Span_IndexOf_NotFound_Test()
{
// Arrange
Span<int> span = [10, 20, 30];
var span = (Span<int>)[10, 20, 30];

// Act & Assert
span.IndexOf(99).Should().Be(-1);
Expand All @@ -210,8 +210,8 @@ public void Span_IndexOf_NotFound_Test()
public void Span_SequenceEqual_Equal_Test()
{
// Arrange
Span<int> span = [1, 2, 3];
ReadOnlySpan<int> other = [1, 2, 3];
var span = (Span<int>)[1, 2, 3];
var other = (ReadOnlySpan<int>)[1, 2, 3];

// Act & Assert
span.SequenceEqual(other).Should().BeTrue();
Expand All @@ -221,8 +221,8 @@ public void Span_SequenceEqual_Equal_Test()
public void Span_SequenceEqual_NotEqual_Test()
{
// Arrange
Span<int> span = [1, 2, 3];
ReadOnlySpan<int> other = [1, 2, 4];
var span = (Span<int>)[1, 2, 3];
var other = (ReadOnlySpan<int>)[1, 2, 4];

// Act & Assert
span.SequenceEqual(other).Should().BeFalse();
Expand All @@ -232,8 +232,8 @@ public void Span_SequenceEqual_NotEqual_Test()
public void Span_SequenceEqual_DifferentLengths_Test()
{
// Arrange
Span<int> span = [1, 2, 3];
ReadOnlySpan<int> other = [1, 2];
var span = (Span<int>)[1, 2, 3];
var other = (ReadOnlySpan<int>)[1, 2];

// Act & Assert
span.SequenceEqual(other).Should().BeFalse();
Expand All @@ -243,7 +243,7 @@ public void Span_SequenceEqual_DifferentLengths_Test()
public void Span_Reverse_Test()
{
// Arrange
Span<int> span = [1, 2, 3, 4, 5];
var span = (Span<int>)[1, 2, 3, 4, 5];

// Act
span.Reverse();
Expand All @@ -256,7 +256,7 @@ public void Span_Reverse_Test()
public void ReadOnlySpan_IndexOf_Found_Test()
{
// Arrange
ReadOnlySpan<int> span = [10, 20, 30, 40, 50];
var span = (ReadOnlySpan<int>)[10, 20, 30, 40, 50];

// Act & Assert
span.IndexOf(30).Should().Be(2);
Expand All @@ -266,7 +266,7 @@ public void ReadOnlySpan_IndexOf_Found_Test()
public void ReadOnlySpan_IndexOf_NotFound_Test()
{
// Arrange
ReadOnlySpan<int> span = [10, 20, 30];
var span = (ReadOnlySpan<int>)[10, 20, 30];

// Act & Assert
span.IndexOf(99).Should().Be(-1);
Expand All @@ -276,8 +276,8 @@ public void ReadOnlySpan_IndexOf_NotFound_Test()
public void ReadOnlySpan_SequenceEqual_Equal_Test()
{
// Arrange
ReadOnlySpan<int> span = [1, 2, 3];
ReadOnlySpan<int> other = [1, 2, 3];
var span = (ReadOnlySpan<int>)[1, 2, 3];
var other = (ReadOnlySpan<int>)[1, 2, 3];

// Act & Assert
span.SequenceEqual(other).Should().BeTrue();
Expand All @@ -287,8 +287,8 @@ public void ReadOnlySpan_SequenceEqual_Equal_Test()
public void ReadOnlySpan_SequenceEqual_NotEqual_Test()
{
// Arrange
ReadOnlySpan<int> span = [1, 2, 3];
ReadOnlySpan<int> other = [1, 9, 3];
var span = (ReadOnlySpan<int>)[1, 2, 3];
var other = (ReadOnlySpan<int>)[1, 9, 3];

// Act & Assert
span.SequenceEqual(other).Should().BeFalse();
Expand Down
24 changes: 12 additions & 12 deletions PolyShim.Tests/NetCore21/MemoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class MemoryTests
public void ImplicitConversion_Test()
{
// Act
Memory<byte> memory = new byte[] { 1, 2, 3, 4, 5 };
var memory = (Memory<byte>)new byte[] { 1, 2, 3, 4, 5 };

// Assert
memory.ToArray().Should().Equal(1, 2, 3, 4, 5);
Expand All @@ -20,7 +20,7 @@ public void ImplicitConversion_Test()
public void Slice_Test()
{
// Arrange
Memory<byte> memory = new byte[] { 10, 20, 30, 40, 50 };
var memory = (Memory<byte>)new byte[] { 10, 20, 30, 40, 50 };

// Act & Assert
memory.Slice(0, 2).ToArray().Should().Equal(10, 20);
Expand All @@ -32,8 +32,8 @@ public void Slice_Test()
public void CopyTo_Test()
{
// Arrange
Memory<byte> source = new byte[] { 1, 2, 3, 4, 5 };
Memory<byte> destination = new byte[5];
var source = (Memory<byte>)new byte[] { 1, 2, 3, 4, 5 };
var destination = (Memory<byte>)new byte[5];

// Act
source.CopyTo(destination);
Expand All @@ -46,8 +46,8 @@ public void CopyTo_Test()
public void TryCopyTo_Test()
{
// Arrange
Memory<byte> source = new byte[] { 1, 2, 3, 4, 5 };
Memory<byte> destination = new byte[5];
var source = (Memory<byte>)new byte[] { 1, 2, 3, 4, 5 };
var destination = (Memory<byte>)new byte[5];

// Act
var result = source.TryCopyTo(destination);
Expand All @@ -62,9 +62,9 @@ public void Equals_Test()
{
// Arrange
var arr = new byte[] { 1, 2, 3 };
Memory<byte> a = arr;
Memory<byte> b = arr;
Memory<byte> c = new byte[] { 1, 2, 3 };
var a = (Memory<byte>)arr;
var b = (Memory<byte>)arr;
var c = (Memory<byte>)new byte[] { 1, 2, 3 };

// Act & Assert
a.Equals(b).Should().BeTrue();
Expand All @@ -79,9 +79,9 @@ public void GetHashCode_Test()
{
// Arrange
var arr = new byte[] { 1, 2, 3 };
Memory<byte> a = arr;
Memory<byte> b = arr;
Memory<byte> c = new byte[] { 1, 2, 3 };
var a = (Memory<byte>)arr;
var b = (Memory<byte>)arr;
var c = (Memory<byte>)new byte[] { 1, 2, 3 };

// Act & Assert
a.GetHashCode().Should().Be(b.GetHashCode());
Expand Down
24 changes: 12 additions & 12 deletions PolyShim.Tests/NetCore21/ReadOnlyMemoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ReadOnlyMemoryTests
public void ImplicitConversion_Test()
{
// Act
ReadOnlyMemory<byte> memory = new byte[] { 1, 2, 3, 4, 5 };
var memory = (ReadOnlyMemory<byte>)new byte[] { 1, 2, 3, 4, 5 };

// Assert
memory.ToArray().Should().Equal(1, 2, 3, 4, 5);
Expand All @@ -20,7 +20,7 @@ public void ImplicitConversion_Test()
public void Slice_Test()
{
// Arrange
ReadOnlyMemory<byte> memory = new byte[] { 10, 20, 30, 40, 50 };
var memory = (ReadOnlyMemory<byte>)new byte[] { 10, 20, 30, 40, 50 };

// Act & Assert
memory.Slice(0, 2).ToArray().Should().Equal(10, 20);
Expand All @@ -32,8 +32,8 @@ public void Slice_Test()
public void CopyTo_Test()
{
// Arrange
ReadOnlyMemory<byte> source = new byte[] { 1, 2, 3, 4, 5 };
Memory<byte> destination = new byte[5];
var source = (ReadOnlyMemory<byte>)new byte[] { 1, 2, 3, 4, 5 };
var destination = (Memory<byte>)new byte[5];

// Act
source.CopyTo(destination);
Expand All @@ -46,8 +46,8 @@ public void CopyTo_Test()
public void TryCopyTo_Test()
{
// Arrange
ReadOnlyMemory<byte> source = new byte[] { 1, 2, 3, 4, 5 };
Memory<byte> destination = new byte[5];
var source = (ReadOnlyMemory<byte>)new byte[] { 1, 2, 3, 4, 5 };
var destination = (Memory<byte>)new byte[5];

// Act
var result = source.TryCopyTo(destination);
Expand All @@ -62,9 +62,9 @@ public void Equals_Test()
{
// Arrange
var arr = new byte[] { 1, 2, 3 };
ReadOnlyMemory<byte> a = arr;
ReadOnlyMemory<byte> b = arr;
ReadOnlyMemory<byte> c = new byte[] { 1, 2, 3 };
var a = (ReadOnlyMemory<byte>)arr;
var b = (ReadOnlyMemory<byte>)arr;
var c = (ReadOnlyMemory<byte>)new byte[] { 1, 2, 3 };

// Act & Assert
a.Equals(b).Should().BeTrue();
Expand All @@ -79,9 +79,9 @@ public void GetHashCode_Test()
{
// Arrange
var arr = new byte[] { 1, 2, 3 };
ReadOnlyMemory<byte> a = arr;
ReadOnlyMemory<byte> b = arr;
ReadOnlyMemory<byte> c = new byte[] { 1, 2, 3 };
var a = (ReadOnlyMemory<byte>)arr;
var b = (ReadOnlyMemory<byte>)arr;
var c = (ReadOnlyMemory<byte>)new byte[] { 1, 2, 3 };

// Act & Assert
a.GetHashCode().Should().Be(b.GetHashCode());
Expand Down
20 changes: 10 additions & 10 deletions PolyShim.Tests/NetCore21/ReadOnlySpanTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class ReadOnlySpanTests
public void ImplicitConversion_Test()
{
// Act
ReadOnlySpan<byte> readOnlySpan = [1, 2, 3, 4, 5];
var readOnlySpan = (ReadOnlySpan<byte>)[1, 2, 3, 4, 5];

// Assert
readOnlySpan.ToArray().Should().Equal(1, 2, 3, 4, 5);
Expand All @@ -21,7 +21,7 @@ public void ImplicitConversion_Test()
public void Indexer_Test()
{
// Arrange
ReadOnlySpan<byte> readOnlySpan = [10, 20, 30, 40, 50];
var readOnlySpan = (ReadOnlySpan<byte>)[10, 20, 30, 40, 50];

// Act & Assert
readOnlySpan[0].Should().Be(10);
Expand All @@ -35,7 +35,7 @@ public void Indexer_Test()
public void Slice_Test()
{
// Arrange
ReadOnlySpan<byte> readOnlySpan = [10, 20, 30, 40, 50];
var readOnlySpan = (ReadOnlySpan<byte>)[10, 20, 30, 40, 50];

// Act
var slice = readOnlySpan.Slice(1, 3);
Expand All @@ -48,8 +48,8 @@ public void Slice_Test()
public void CopyTo_Test()
{
// Arrange
ReadOnlySpan<byte> source = [1, 2, 3, 4, 5];
Span<byte> destination = new byte[5];
var source = (ReadOnlySpan<byte>)[1, 2, 3, 4, 5];
var destination = (Span<byte>)new byte[5];

// Act
source.CopyTo(destination);
Expand All @@ -62,8 +62,8 @@ public void CopyTo_Test()
public void TryCopyTo_Test()
{
// Arrange
ReadOnlySpan<byte> source = [1, 2, 3, 4, 5];
Span<byte> destination = new byte[5];
var source = (ReadOnlySpan<byte>)[1, 2, 3, 4, 5];
var destination = (Span<byte>)new byte[5];

// Act
var result = source.TryCopyTo(destination);
Expand All @@ -77,7 +77,7 @@ public void TryCopyTo_Test()
public void Enumeration_Test()
{
// Arrange
ReadOnlySpan<byte> readOnlySpan = [1, 2, 3, 4, 5];
var readOnlySpan = (ReadOnlySpan<byte>)[1, 2, 3, 4, 5];
var result = new List<byte>();

// Act
Expand All @@ -92,11 +92,11 @@ public void Enumeration_Test()
public void Contains_Test()
{
// Act & Assert
ReadOnlySpan<byte> span = [1, 2, 3, 4, 5];
var span = (ReadOnlySpan<byte>)[1, 2, 3, 4, 5];
span.Contains((byte)3).Should().BeTrue();
span.Contains((byte)10).Should().BeFalse();

ReadOnlySpan<byte> emptySpan = [];
var emptySpan = (ReadOnlySpan<byte>)[];
emptySpan.Contains((byte)1).Should().BeFalse();
}
}
Loading
Loading