Merge pull request #111 from pfpack/dev

Dev
pfpack · May 18, 2022 · c398114 · c398114
2 parents 313129c + 92b8151
commit c398114
Show file tree

Hide file tree

Showing 25 changed files with 146 additions and 58 deletions.
diff --git a/src/core-taggeds-failure/Failure.Tests/Failure.Tests.csproj b/src/core-taggeds-failure/Failure.Tests/Failure.Tests.csproj
@@ -15,13 +15,13 @@
 
   <ItemGroup>
     <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/core-taggeds-failure/Failure/Failure.T/Failure.T.Equality.Common.cs b/src/core-taggeds-failure/Failure/Failure.T/Failure.T.Equality.Common.cs
@@ -8,6 +8,10 @@ private static Type EqualityContract
         =>
         typeof(Failure<TFailureCode>);
 
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
+
     private static EqualityComparer<TFailureCode> FailureCodeComparer
         =>
         EqualityComparer<TFailureCode>.Default;

diff --git a/src/core-taggeds-failure/Failure/Failure.T/Failure.T.Equality.GetHashCode.cs b/src/core-taggeds-failure/Failure/Failure.T/Failure.T.Equality.GetHashCode.cs
@@ -5,7 +5,7 @@ partial struct Failure<TFailureCode>
     public override int GetHashCode()
         =>
         HashCode.Combine(
-            EqualityContract,
+            EqualityContractComparer.GetHashCode(EqualityContract),
             FailureCodeComparer.GetHashCode(FailureCode),
             FailureMessageComparer.GetHashCode(FailureMessage));
 }
diff --git a/src/core-taggeds-failure/Failure/Failure.csproj b/src/core-taggeds-failure/Failure/Failure.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Core.Failure is a core library for .NET consisting of Failure type targeted for use in functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.Failure</AssemblyName>
-    <Version>2.0.0</Version>
+    <Version>2.0.1-preview.1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.1" />
+    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/core-taggeds-optional/Optional.Tests/Optional.Tests.csproj b/src/core-taggeds-optional/Optional.Tests/Optional.Tests.csproj
@@ -14,9 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
     <PackageReference Include="PrimeFuncPack.UnitTest.Moq" Version="1.0.3" />
   </ItemGroup>

diff --git a/src/core-taggeds-optional/Optional/Absent.T/Absent.T.Equality.cs b/src/core-taggeds-optional/Optional/Absent.T/Absent.T.Equality.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace System;
 
@@ -14,5 +15,6 @@ public override bool Equals([NotNullWhen(true)] object? obj)
 
     public override int GetHashCode()
         =>
-        HashCode.Combine(typeof(Absent<T>));
+        HashCode.Combine(
+            EqualityComparer<Type>.Default.GetHashCode(typeof(Absent<T>)));
 }
diff --git a/src/core-taggeds-optional/Optional/Optional.T/Optional.T.Equality.Common.cs b/src/core-taggeds-optional/Optional/Optional.T/Optional.T.Equality.Common.cs
@@ -4,7 +4,15 @@ namespace System;
 
 partial struct Optional<T>
 {
-    private static Type EqualityContract => typeof(Optional<T>);
+    private static Type EqualityContract
+        =>
+        typeof(Optional<T>);
 
-    private static EqualityComparer<T> EqualityComparer => EqualityComparer<T>.Default;
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
+
+    private static EqualityComparer<T> EqualityComparer
+        =>
+        EqualityComparer<T>.Default;
 }
diff --git a/src/core-taggeds-optional/Optional/Optional.T/Optional.T.Equality.GetHashCode.cs b/src/core-taggeds-optional/Optional/Optional.T/Optional.T.Equality.GetHashCode.cs
@@ -12,11 +12,16 @@ public override int GetHashCode()
     private int PresentHashCode()
         =>
         value is not null
-            ? HashCode.Combine(EqualityContract, true, EqualityComparer.GetHashCode(value))
-            : HashCode.Combine(EqualityContract, true);
+            ? HashCode.Combine(EqualityContractHashCode(), true, EqualityComparer.GetHashCode(value))
+            : HashCode.Combine(EqualityContractHashCode(), true);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static int AbsentHashCode()
         =>
-        HashCode.Combine(EqualityContract);
+        HashCode.Combine(EqualityContractHashCode());
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int EqualityContractHashCode()
+        =>
+        EqualityContractComparer.GetHashCode(EqualityContract);
 }
diff --git a/src/core-taggeds-optional/Optional/Optional.csproj b/src/core-taggeds-optional/Optional/Optional.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Core.Optional is a core library for .NET consisting of Optional monad targeted for use in functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.Optional</AssemblyName>
-    <Version>2.0.0</Version>
+    <Version>2.0.1-preview.1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.1" />
+    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/core-taggeds-optional/Optional/Present.T/Present.T.Equality.Common.cs b/src/core-taggeds-optional/Optional/Present.T/Present.T.Equality.Common.cs
@@ -4,7 +4,15 @@ namespace System;
 
 partial struct Present<T>
 {
-    private static Type EqualityContract => typeof(Present<T>);
+    private static Type EqualityContract
+        =>
+        typeof(Present<T>);
 
-    private static EqualityComparer<T> EqualityComparer => EqualityComparer<T>.Default;        
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
+
+    private static EqualityComparer<T> EqualityComparer
+        =>
+        EqualityComparer<T>.Default;
 }
diff --git a/src/core-taggeds-optional/Optional/Present.T/Present.T.Equality.GetHashCode.cs b/src/core-taggeds-optional/Optional/Present.T/Present.T.Equality.GetHashCode.cs
@@ -1,10 +1,17 @@
+using System.Runtime.CompilerServices;
+
 namespace System;
 
 partial struct Present<T>
 {
     public override int GetHashCode()
         =>
         value is not null
-            ? HashCode.Combine(EqualityContract, EqualityComparer.GetHashCode(value))
-            : HashCode.Combine(EqualityContract);
+            ? HashCode.Combine(EqualityContractHashCode(), EqualityComparer.GetHashCode(value))
+            : HashCode.Combine(EqualityContractHashCode());
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int EqualityContractHashCode()
+        =>
+        EqualityContractComparer.GetHashCode(EqualityContract);
 }
diff --git a/src/core-taggeds-result/Result.Tests/Result.Tests.csproj b/src/core-taggeds-result/Result.Tests/Result.Tests.csproj
@@ -14,9 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
   </ItemGroup>
 

diff --git a/src/core-taggeds-result/Result/Result.T.Builder.Failure/FailureBuilder.T.Equality.Common.cs b/src/core-taggeds-result/Result/Result.T.Builder.Failure/FailureBuilder.T.Equality.Common.cs
@@ -5,7 +5,15 @@ namespace PrimeFuncPack.Core;
 
 partial struct FailureBuilder<TFailure>
 {
-    private static Type EqualityContract => typeof(FailureBuilder<TFailure>);
+    private static Type EqualityContract
+        =>
+        typeof(FailureBuilder<TFailure>);
 
-    private static EqualityComparer<TFailure> FailureComparer => EqualityComparer<TFailure>.Default;
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
+
+    private static EqualityComparer<TFailure> FailureComparer
+        =>
+        EqualityComparer<TFailure>.Default;
 }
diff --git a/src/core-taggeds-result/Result/Result.T.Builder.Failure/FailureBuilder.T.GetHashCode.cs b/src/core-taggeds-result/Result/Result.T.Builder.Failure/FailureBuilder.T.GetHashCode.cs
@@ -6,5 +6,7 @@ partial struct FailureBuilder<TFailure>
 {
     public override int GetHashCode()
         =>
-        HashCode.Combine(EqualityContract, FailureComparer.GetHashCode(failure));
+        HashCode.Combine(
+            EqualityContractComparer.GetHashCode(EqualityContract),
+            FailureComparer.GetHashCode(failure));
 }
diff --git a/src/core-taggeds-result/Result/Result.T.Builder.Success/SuccessBuilder.T.Equality.Common.cs b/src/core-taggeds-result/Result/Result.T.Builder.Success/SuccessBuilder.T.Equality.Common.cs
@@ -5,7 +5,15 @@ namespace PrimeFuncPack.Core;
 
 partial struct SuccessBuilder<TSuccess>
 {
-    private static Type EqualityContract => typeof(SuccessBuilder<TSuccess>);
+    private static Type EqualityContract
+        =>
+        typeof(SuccessBuilder<TSuccess>);
 
-    private static EqualityComparer<TSuccess> SuccessComparer => EqualityComparer<TSuccess>.Default;
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
+
+    private static EqualityComparer<TSuccess> SuccessComparer 
+        =>
+        EqualityComparer<TSuccess>.Default;
 }
diff --git a/...e-taggeds-result/Result/Result.T.Builder.Success/SuccessBuilder.T.Equality.GetHashCode.cs b/...e-taggeds-result/Result/Result.T.Builder.Success/SuccessBuilder.T.Equality.GetHashCode.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.CompilerServices;
 
 namespace PrimeFuncPack.Core;
 
@@ -7,6 +8,11 @@ partial struct SuccessBuilder<TSuccess>
     public override int GetHashCode()
         =>
         success is not null
-            ? HashCode.Combine(EqualityContract, SuccessComparer.GetHashCode(success))
-            : HashCode.Combine(EqualityContract);
+            ? HashCode.Combine(EqualityContractHashCode(), SuccessComparer.GetHashCode(success))
+            : HashCode.Combine(EqualityContractHashCode());
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int EqualityContractHashCode()
+        =>
+        EqualityContractComparer.GetHashCode(EqualityContract);
 }
diff --git a/src/core-taggeds-result/Result/Result.T/Result.T.Equality.Common.cs b/src/core-taggeds-result/Result/Result.T/Result.T.Equality.Common.cs
@@ -4,9 +4,19 @@ namespace System;
 
 partial struct Result<TSuccess, TFailure>
 {
-    private static Type EqualityContract => typeof(Result<TSuccess, TFailure>);
+    private static Type EqualityContract
+        =>
+        typeof(Result<TSuccess, TFailure>);
 
-    private static EqualityComparer<TSuccess> SuccessComparer => EqualityComparer<TSuccess>.Default;
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
 
-    private static EqualityComparer<TFailure> FailureComparer => EqualityComparer<TFailure>.Default;
+    private static EqualityComparer<TSuccess> SuccessComparer
+        =>
+        EqualityComparer<TSuccess>.Default;
+
+    private static EqualityComparer<TFailure> FailureComparer
+        =>
+        EqualityComparer<TFailure>.Default;
 }
diff --git a/src/core-taggeds-result/Result/Result.T/Result.T.Equality.GetHashCode.cs b/src/core-taggeds-result/Result/Result.T/Result.T.Equality.GetHashCode.cs
@@ -12,11 +12,16 @@ public override int GetHashCode()
     private int SuccessHashCode()
         =>
         success is not null
-            ? HashCode.Combine(EqualityContract, true, SuccessComparer.GetHashCode(success))
-            : HashCode.Combine(EqualityContract, true);
+            ? HashCode.Combine(EqualityContractHashCode(), true, SuccessComparer.GetHashCode(success))
+            : HashCode.Combine(EqualityContractHashCode(), true);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private int FailureHashCode()
         =>
-        HashCode.Combine(EqualityContract, false, FailureComparer.GetHashCode(failure));
+        HashCode.Combine(EqualityContractHashCode(), false, FailureComparer.GetHashCode(failure));
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int EqualityContractHashCode()
+        =>
+        EqualityContractComparer.GetHashCode(EqualityContract);
 }
diff --git a/src/core-taggeds-result/Result/Result.csproj b/src/core-taggeds-result/Result/Result.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Core.Result is a core library for .NET consisting of Result monad targeted for use in functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.Result</AssemblyName>
-    <Version>2.0.0</Version>
+    <Version>2.0.1-preview.1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.1" />
+    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/core-taggeds-union/TaggedUnion.Tests/TaggedUnion.Tests.csproj b/src/core-taggeds-union/TaggedUnion.Tests/TaggedUnion.Tests.csproj
@@ -14,9 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
   </ItemGroup>
 

diff --git a/src/core-taggeds-union/TaggedUnion/TaggedUnion.T/TaggedUnion.T.Equality.Common.cs b/src/core-taggeds-union/TaggedUnion/TaggedUnion.T/TaggedUnion.T.Equality.Common.cs
@@ -4,9 +4,19 @@ namespace System;
 
 partial struct TaggedUnion<TFirst, TSecond>
 {
-    private static Type EqualityContract => typeof(TaggedUnion<TFirst, TSecond>);
+    private static Type EqualityContract
+        =>
+        typeof(TaggedUnion<TFirst, TSecond>);
 
-    private static EqualityComparer<TFirst> FirstComparer => EqualityComparer<TFirst>.Default;
+    private static EqualityComparer<Type> EqualityContractComparer
+        =>
+        EqualityComparer<Type>.Default;
 
-    private static EqualityComparer<TSecond> SecondComparer => EqualityComparer<TSecond>.Default;
+    private static EqualityComparer<TFirst> FirstComparer
+        =>
+        EqualityComparer<TFirst>.Default;
+
+    private static EqualityComparer<TSecond> SecondComparer
+        =>
+        EqualityComparer<TSecond>.Default;
 }
diff --git a/src/core-taggeds-union/TaggedUnion/TaggedUnion.T/TaggedUnion.T.Equality.GetHashCode.cs b/src/core-taggeds-union/TaggedUnion/TaggedUnion.T/TaggedUnion.T.Equality.GetHashCode.cs
@@ -23,18 +23,23 @@ public override int GetHashCode()
     private int FirstHashCode()
         =>
         first is not null
-            ? HashCode.Combine(EqualityContract, InternalTag.First, FirstComparer.GetHashCode(first))
-            : HashCode.Combine(EqualityContract, InternalTag.First);
+            ? HashCode.Combine(EqualityContractHashCode(), InternalTag.First, FirstComparer.GetHashCode(first))
+            : HashCode.Combine(EqualityContractHashCode(), InternalTag.First);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private int SecondHashCode()
         =>
         second is not null
-            ? HashCode.Combine(EqualityContract, InternalTag.Second, SecondComparer.GetHashCode(second))
-            : HashCode.Combine(EqualityContract, InternalTag.Second);
+            ? HashCode.Combine(EqualityContractHashCode(), InternalTag.Second, SecondComparer.GetHashCode(second))
+            : HashCode.Combine(EqualityContractHashCode(), InternalTag.Second);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static int NoneHashCode()
         =>
-        HashCode.Combine(EqualityContract);
+        HashCode.Combine(EqualityContractHashCode());
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int EqualityContractHashCode()
+        =>
+        EqualityContractComparer.GetHashCode(EqualityContract);
 }
diff --git a/src/core-taggeds-union/TaggedUnion/TaggedUnion.csproj b/src/core-taggeds-union/TaggedUnion/TaggedUnion.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Core.TaggedUnion is a core library for .NET consisting of Tagged Union targeted for use in functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.TaggedUnion</AssemblyName>
-    <Version>2.0.0</Version>
+    <Version>2.0.1-preview.1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.1" />
+    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.2" />
   </ItemGroup>
 
 </Project>