Skip to content

Commit df2646a

Browse files
committed
Merge branch 'master' into v1.3
2 parents 0f0fd9d + 72b0259 commit df2646a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/FSharpPlus/Control/Applicative.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ type Lift3 =
129129
static member Lift3 (f, (x , y , z ), _mthd: Lift3) = List.lift3 f x y z
130130
static member Lift3 (f, (x , y , z ), _mthd: Lift3) = Array.lift3 f x y z
131131
static member Lift3 (f, (x: 'R -> 'T , y: 'R -> 'U , z: 'R -> 'V ), _mthd: Lift3) = fun a -> f (x a) (y a) (z a)
132+
static member inline Lift3 (f, ((a: 'Monoid, x: 'T) , (b: 'Monoid, y: 'U) , (c: 'Monoid, z: 'U) ), _mthd: Lift3) = Plus.Invoke (Plus.Invoke a b) c, f x y z
133+
static member inline Lift3 (f, (struct (a: 'Monoid, x: 'T), struct (b: 'Monoid, y: 'U), struct (c: 'Monoid, z: 'U)), _mthd: Lift3) = struct (Plus.Invoke (Plus.Invoke a b) c, f x y z)
132134
#if !FABLE_COMPILER
133135
static member Lift3 (f, (x: Task<'T> , y: Task<'U> , z: Task<'V> ), _mthd: Lift3) = Task.map3 f x y z
134136
#endif

src/FSharpPlus/Control/Monad.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ type Join =
9393
static member Join (x: list<list<_>> , [<Optional>]_output: list<'T> , [<Optional>]_mthd: Join ) = List.concat x : list<'T>
9494
static member Join (x: _ [][] , [<Optional>]_output: 'T [] , [<Optional>]_mthd: Join ) = Array.concat x : 'T []
9595
static member Join (g , [<Optional>]_output: 'R->'T , [<Optional>]_mthd: Join ) = (fun r -> (g r) r) : 'R->'T
96-
static member inline Join (m1, (m2, x) , [<Optional>]_output: 'Monoid * 'T , [<Optional>]_mthd: Join ) = Plus.Invoke m1 m2, x : 'Monoid*'T
96+
static member inline Join ((m1, (m2, x)) , [<Optional>]_output: 'Monoid * 'T , [<Optional>]_mthd: Join ) = Plus.Invoke m1 m2, x : 'Monoid*'T
9797
static member inline Join (struct (m1, struct (m2, x)), [<Optional>]_output: struct ('Monoid * 'T), [<Optional>]_mthd: Join) = Plus.Invoke m1 m2, x : struct ('Monoid * 'T)
9898
static member Join (x , [<Optional>]_output: Async<'T> , [<Optional>]_mthd: Join ) = async.Bind (x, id) : Async<'T>
9999
static member Join (x , [<Optional>]_output: Result<'T,'E> , [<Optional>]_mthd: Join ) = Result.flatten x : Result<'T,'E>

0 commit comments

Comments
 (0)