Merge remote-tracking branch 'origin/master' into v1.3

fsprojects · Feb 5, 2023 · 87cde45 · 87cde45
2 parents 6d7976a + c525bcb
commit 87cde45
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 1.3.3  - February 4 2023
+ - Fix missing zero overload for voption
+
 #### 1.3.2  - December 2 2022
  - Applicative Computation Expressions
  - Support for ValueOption, ValueTask and ValueTuple

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,18 +1,4 @@
-Release Notes for FSharpPlus 1.3.2  - December 2 2022
+Release Notes for FSharpPlus 1.3.3  - February 4 2023
 -----------------------------------------------------
 
-Applicative Computation Expressions
-Support for ValueOption, ValueTask and ValueTuple
-Possibility to use explicit type parameters (plus, Seq.sum, guard, ofBytes, ofBytesWithOptions, ofBytesBE, parse, tryParse)
-Use InlineIfLambda attribute in CEs
-Small fixes (add lift3 for tuples, fix join for ref tuple and Free.map3)
-Small improvements in type inference
-Use F# Core 6.0.6
-Speed up List and Array extensions using Collectors
-Use FSharp.Core implementations for old functions that were adopted there
-Add some missing Option, Result zip functions
-Add explicit type parameters
-Speed up by using InlineIfLambda attribute in CEs
-Some missing Option, Result zip functions
-Add NonEmptyList.sequence
-Improve null handling for Array extensions
+Fix missing zero overload for voption
diff --git a/src/FSharpPlus/Control/Numeric.fs b/src/FSharpPlus/Control/Numeric.fs
@@ -136,6 +136,7 @@ type Zero =
     static member        Zero (_: DmStruct                       , _: Zero    ) = Unchecked.defaultof<DmStruct>
     static member        Zero (_: list<'a>                       , _: Zero    ) = []   :   list<'a>
     static member        Zero (_: option<'a>                     , _: Zero    ) = None : option<'a>
+    static member        Zero (_: voption<'a>                    , _: Zero    ) = ValueNone : voption<'a>
     static member        Zero (_: array<'a>                      , _: Zero    ) = [||] :  array<'a>
     static member        Zero (_: string                         , _: Zero    ) = ""
     static member        Zero (_: StringBuilder                  , _: Zero    ) = new StringBuilder ()

diff --git a/tests/FSharpPlus.Tests/General.fs b/tests/FSharpPlus.Tests/General.fs
@@ -1704,6 +1704,20 @@ module Numerics =
 
         Assert.AreEqual (argBigRational, r09 * r19)
 
+    [<Struct>]
+    type GuidId<'t> =
+        | Id of Guid
+
+    [<Test>]
+    let zeroOfDifferentTypes () = 
+        let _01 = zero<int option>
+        areEqual None _01
+        let _02 = zero<GuidId<int> option>
+        areEqual None _02
+        let _03 = zero<int voption>
+        areEqual ValueNone _03
+        let _04 = zero<GuidId<int> voption>
+        areEqual ValueNone _04