Skip to content

Commit 0cb9b26

Browse files
gustygusty
committed
Remove Fable's tuple helpers
1 parent e4d5843 commit 0cb9b26

File tree

4 files changed

+15
-25
lines changed

4 files changed

+15
-25
lines changed

‎src/FSharpPlus/Control/Numeric.fs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,17 @@ type Zero with
166166
#endif
167167

168168
type Zero with
169-
static member inline Zero (_: Tuple<'a>, _: Zero) = tuple1 (Zero.Invoke ()) : Tuple<'a>
170-
static member inline Zero (_: Id<'a> , _: Zero) = Id<_> (Zero.Invoke ())
171-
static member inline Zero (_: ValueTuple<'a>, _: Zero) = valueTuple1 (Zero.Invoke ()) : ValueTuple<'a>
172-
169+
static member inline Zero (_: Tuple<'a> , _: Zero) = Tuple<_> (Zero.Invoke ()) : Tuple<'a>
170+
static member inline Zero (_: Id<'a> , _: Zero) = Id<_> (Zero.Invoke ())
171+
static member inline Zero (_: ValueTuple<'a>, _: Zero) = ValueTuple<_> (Zero.Invoke ()) : ValueTuple<'a>
172+
173173
type Zero with static member inline Zero (_: 'a*'b , _: Zero) = (Zero.Invoke (), Zero.Invoke () ) : 'a*'b
174174
type Zero with static member inline Zero (_: 'a*'b*'c , _: Zero) = (Zero.Invoke (), Zero.Invoke (), Zero.Invoke () ) : 'a*'b*'c
175175
type Zero with static member inline Zero (_: 'a*'b*'c*'d , _: Zero) = (Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke () ) : 'a*'b*'c*'d
176176
type Zero with static member inline Zero (_: 'a*'b*'c*'d*'e , _: Zero) = (Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke () ) : 'a*'b*'c*'d*'e
177177
type Zero with static member inline Zero (_: 'a*'b*'c*'d*'e*'f , _: Zero) = (Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke () ) : 'a*'b*'c*'d*'e*'f
178178
type Zero with static member inline Zero (_: 'a*'b*'c*'d*'e*'f*'g, _: Zero) = (Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke ()) : 'a*'b*'c*'d*'e*'f*'g
179-
179+
180180
type Zero with static member inline Zero (_: ValueTuple<'a,'b> , _: Zero) = ValueTuple.Create (Zero.Invoke (), Zero.Invoke () ) : ValueTuple<'a,'b>
181181
type Zero with static member inline Zero (_: ValueTuple<'a,'b,'c> , _: Zero) = ValueTuple.Create (Zero.Invoke (), Zero.Invoke (), Zero.Invoke () ) : ValueTuple<'a,'b,'c>
182182
type Zero with static member inline Zero (_: ValueTuple<'a,'b,'c,'d> , _: Zero) = ValueTuple.Create (Zero.Invoke (), Zero.Invoke (), Zero.Invoke (), Zero.Invoke () ) : ValueTuple<'a,'b,'c,'d>
@@ -575,8 +575,8 @@ type MinValue =
575575
let (t1: 't1) = MinValue.Invoke ()
576576
Tuple<_,_,_,_,_,_,_,_> (t1, t2, t3, t4, t5, t6, t7, tr) |> retype : 't
577577

578-
static member inline MinValue (_: Tuple<'a>, _: MinValue) = tuple1 (MinValue.Invoke ()) : Tuple<'a>
579-
static member inline MinValue (_: Id<'a> , _: MinValue) = Id<_> (MinValue.Invoke ())
578+
static member inline MinValue (_: Tuple<'a>, _: MinValue) = Tuple<_> (MinValue.Invoke ()) : Tuple<'a>
579+
static member inline MinValue (_: Id<'a> , _: MinValue) = Id<_> (MinValue.Invoke ())
580580

581581
static member inline MinValue (_: 'a*'b , _: MinValue) = (MinValue.Invoke (), MinValue.Invoke ())
582582
static member inline MinValue (_: 'a*'b*'c , _: MinValue) = (MinValue.Invoke (), MinValue.Invoke (), MinValue.Invoke ())
@@ -625,8 +625,8 @@ type MaxValue =
625625
let (t1: 't1) = MaxValue.Invoke ()
626626
Tuple<_,_,_,_,_,_,_,_> (t1, t2, t3, t4, t5, t6, t7, tr) |> retype : 't
627627

628-
static member inline MaxValue (_: Tuple<'a>, _: MaxValue) = tuple1 (MaxValue.Invoke ()) : Tuple<'a>
629-
static member inline MaxValue (_: Id<'a> , _: MaxValue) = Id<_> (MaxValue.Invoke ())
628+
static member inline MaxValue (_: Tuple<'a>, _: MaxValue) = Tuple<_> (MaxValue.Invoke ()) : Tuple<'a>
629+
static member inline MaxValue (_: Id<'a> , _: MaxValue) = Id<_> (MaxValue.Invoke ())
630630

631631
static member inline MaxValue (_: 'a*'b , _: MaxValue) = (MaxValue.Invoke (), MaxValue.Invoke ())
632632
static member inline MaxValue (_: 'a*'b*'c , _: MaxValue) = (MaxValue.Invoke (), MaxValue.Invoke (), MaxValue.Invoke ())

‎src/FSharpPlus/Control/Tuple.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type MapItem1 =
2626
let x1 = (^t : (member Item1: 't1) t)
2727
Tuple<_,_,_,_,_,_,_,_> (fn x1, x2, x3, x4, x5, x6, x7, xr)
2828

29-
static member MapItem1 ( x: Tuple<_> , fn) = tuple1 (fn x.Item1)
29+
static member MapItem1 ( x: Tuple<_> , fn) = Tuple<_> (fn x.Item1)
3030

3131
#endif
3232

@@ -173,7 +173,7 @@ type Curry =
173173
let _f _ = Constraints.whenNestedTuple t : ('t1*'t2*'t3*'t4*'t5*'t6*'t7*'tr)
174174
f (Tuple<'t1,'t2,'t3,'t4,'t5,'t6,'t7,'tr> (t1, t2, t3, t4, t5, t6, t7, tr) |> retype))
175175

176-
static member Curry (_: Tuple<'t1> , _: Curry) = fun f t1 -> f (tuple1 t1)
176+
static member Curry (_: Tuple<'t1> , _: Curry) = fun f t1 -> f (Tuple<_> t1)
177177
static member Curry ((_, _) , _: Curry) = fun f t1 t2 -> f (t1, t2)
178178
static member Curry ((_, _, _) , _: Curry) = fun f t1 t2 t3 -> f (t1, t2, t3)
179179
static member Curry ((_, _, _, _) , _: Curry) = fun f t1 t2 t3 t4 -> f (t1, t2, t3, t4)

‎src/FSharpPlus/Internals.fs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,6 @@ module internal Prelude =
3838
unbox<'U> x
3939
#endif
4040

41-
let inline tuple1<'t> (x: 't) =
42-
#if FABLE_COMPILER
43-
let t = ((),(),(),(),(),(),(),x)
44-
t.Rest
45-
#else
46-
System.Tuple<_> x
47-
#endif
48-
49-
let inline valueTuple1<'T1> (t1: 'T1) = ValueTuple.Create t1
50-
5141
[<RequireQualifiedAccess>]
5242
module internal Implicit = let inline Invoke (x: ^t) = ((^R or ^t) : (static member op_Implicit : ^t -> ^R) x) : ^R
5343

‎src/FSharpPlus/Parsing.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ module Parsing =
7373
Tuple<_,_,_,_,_,_,_,_> (t1, t2, t3, t4, t5, t6, t7, tr) |> retype : 't
7474

7575
static member inline ParseArray (_: unit , _: ParseArray) = fun (_: (string * string) []) -> ()
76-
static member inline ParseArray (_: Tuple<'t1> , _: ParseArray) = fun (g: (string * string) []) -> tuple1 (parse g.[0]) : Tuple<'t1>
77-
static member inline ParseArray (_: Id<'t1> , _: ParseArray) = fun (g: (string * string) []) -> Id<_> (parse g.[0])
76+
static member inline ParseArray (_: Tuple<'t1> , _: ParseArray) = fun (g: (string * string) []) -> Tuple<_> (parse g.[0]) : Tuple<'t1>
77+
static member inline ParseArray (_: Id<'t1> , _: ParseArray) = fun (g: (string * string) []) -> Id<_> (parse g.[0])
7878
static member inline ParseArray (_: 't1*'t2 , _: ParseArray) = fun (g: (string * string) []) -> parse g.[0], parse g.[1]
7979
static member inline ParseArray (_: 't1*'t2'*'t3 , _: ParseArray) = fun (g: (string * string) []) -> parse g.[0], parse g.[1], parse g.[2]
8080
static member inline ParseArray (_: 't1*'t2'*'t3*'t4 , _: ParseArray) = fun (g: (string * string) []) -> parse g.[0], parse g.[1], parse g.[2], parse g.[3]
@@ -109,8 +109,8 @@ module Parsing =
109109
| _ -> None
110110

111111
static member inline TryParseArray (_: unit , _: TryParseArray) = fun (_: (string * string) []) -> ()
112-
static member inline TryParseArray (_: Tuple<'t1> , _: TryParseArray) = fun (g: (string * string) []) -> tuple1 <!> tryParseElemAt 0 g : Tuple<'t1> option
113-
static member inline TryParseArray (_: Id<'t1> , _: TryParseArray) = fun (g: (string * string) []) -> Id<_> <!> tryParseElemAt 0 g
112+
static member inline TryParseArray (_: Tuple<'t1> , _: TryParseArray) = fun (g: (string * string) []) -> Tuple<_> <!> tryParseElemAt 0 g : Tuple<'t1> option
113+
static member inline TryParseArray (_: Id<'t1> , _: TryParseArray) = fun (g: (string * string) []) -> Id<_> <!> tryParseElemAt 0 g
114114
static member inline TryParseArray (_: 't1*'t2 , _: TryParseArray) = fun (g: (string * string) []) -> tuple2 <!> tryParseElemAt 0 g <*> tryParseElemAt 1 g
115115
static member inline TryParseArray (_: 't1*'t2'*'t3 , _: TryParseArray) = fun (g: (string * string) []) -> tuple3 <!> tryParseElemAt 0 g <*> tryParseElemAt 1 g <*> tryParseElemAt 2 g
116116
static member inline TryParseArray (_: 't1*'t2'*'t3*'t4 , _: TryParseArray) = fun (g: (string * string) []) -> tuple4 <!> tryParseElemAt 0 g <*> tryParseElemAt 1 g <*> tryParseElemAt 2 g <*> tryParseElemAt 3 g

0 commit comments

Comments
 (0)