Skip to content

Commit 19ecf22

Browse files
gustygusty
committed
Use a single underscore
1 parent b6ea9bb commit 19ecf22

File tree

11 files changed

+82
-81
lines changed

11 files changed

+82
-81
lines changed

‎src/FSharpPlus/Control/Functor.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ type Contramap =
310310
static member Contramap (k: Func<'T, 'C> , f: 'U -> 'T, [<Optional>]_mthd: Contramap) = Func<'U, 'C> (f >> k.Invoke)
311311
#if !FABLE_COMPILER
312312
static member Contramap (p: Predicate<_> , f: 'U -> 'T, [<Optional>]_mthd: Contramap) = Predicate (fun x -> p.Invoke (f x))
313-
static member Contramap (c: IComparer<_> , f: 'U -> 'T, [<Optional>]_mthd: Contramap) = { new IComparer<'U> with member __.Compare (x, y) = c.Compare (f x, f y) }
313+
static member Contramap (c: IComparer<_> , f: 'U -> 'T, [<Optional>]_mthd: Contramap) = { new IComparer<'U> with member _.Compare (x, y) = c.Compare (f x, f y) }
314314
static member Contramap (c: IEqualityComparer<_>, f: 'U -> 'T, [<Optional>]_mthd: Contramap) = {
315315
new IEqualityComparer<'U> with
316-
member __.Equals (x, y) = c.Equals (f x, f y)
317-
member __.GetHashCode x = c.GetHashCode (f x) }
316+
member _.Equals (x, y) = c.Equals (f x, f y)
317+
member _.GetHashCode x = c.GetHashCode (f x) }
318318
#endif
319319
#endif
320320

‎src/FSharpPlus/Data/Coproduct.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ open FSharpPlus.Control
1010
type CoproductBase<'``functorL<'t>``,'``functorR<'t>``> (left: '``functorL<'t>``, right: '``functorR<'t>``, isLeft: bool) =
1111
let (left, right, isLeft) = left, right, isLeft
1212
with
13-
member __.getContents () = left, right, isLeft
13+
member _.getContents () = left, right, isLeft
1414
override x.GetHashCode () = Unchecked.hash (x.getContents ())
1515
override x.Equals o =
1616
match o with

‎src/FSharpPlus/Data/DList.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type DList<'T> (length: int, data: DListData<'T>) =
5959
#endif
6060

6161
/// O(1). Returns the count of elememts.
62-
member __.Length = length
62+
member _.Length = length
6363

6464
// O(n). FoldBack walks the DList using constant stack space. Implementation is from Norman Ramsey.
6565
// Called a "fold" in the article processes the linear representation from right to left
@@ -131,22 +131,22 @@ type DList<'T> (length: int, data: DListData<'T>) =
131131
| _ -> None
132132

133133
/// O(1). Returns a new DList with the element added to the front.
134-
member __.Cons (hd: 'T) =
134+
member _.Cons (hd: 'T) =
135135
match data with
136136
| Nil -> DList (1, Unit hd)
137137
| _ -> DList (length + 1, Join (Unit hd, data))
138138

139139
/// O(log n). Returns the first element.
140-
member __.Head = DList<'T>.head data
140+
member _.Head = DList<'T>.head data
141141

142142
/// O(log n). Returns option first element
143-
member __.TryHead = DList<'T>.tryHead data
143+
member _.TryHead = DList<'T>.tryHead data
144144

145145
/// O(1). Returns true if the DList has no elements.
146-
member __.IsEmpty = match data with Nil -> true | _ -> false
146+
member _.IsEmpty = match data with Nil -> true | _ -> false
147147

148148
/// O(1). Returns a new DList with the element added to the end.
149-
member __.Add (x: 'T) = DList(length + 1, DList<'T>.append (data, Unit x))
149+
member _.Add (x: 'T) = DList(length + 1, DList<'T>.append (data, Unit x))
150150

151151
/// O(log n). Returns a new DList of the elements trailing the first element.
152152
member this.Tail =
@@ -180,7 +180,7 @@ type DList<'T> (length: int, data: DListData<'T>) =
180180
if index < 0 || index >= s.Length then raise (System.IndexOutOfRangeException ())
181181
DList.findi withIndex s
182182

183-
member __.toSeq () =
183+
member _.toSeq () =
184184
//adaptation of right-hand side of Norman Ramsey's "fold"
185185
let rec walk rights l = seq {
186186
match l with

‎src/FSharpPlus/Data/NonEmptyList.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,11 @@ type NonEmptyList<'t> with
277277
module NonEmptyListBuilder =
278278
type NelBuilder () =
279279
[<CompilerMessage("A NonEmptyList doesn't support the Zero operation.", 708, IsError = true)>]
280-
member __.Zero () = raise Internals.Errors.exnUnreachable
281-
member __.Combine (a: 'T, { Head = b; Tail = c }) = { Head = a; Tail = b::c }
282-
member __.Yield x = x
283-
member __.Delay expr = expr ()
284-
member __.Run (x: NonEmptyList<_>) = x
280+
member _.Zero () = raise Internals.Errors.exnUnreachable
281+
member _.Combine (a: 'T, { Head = b; Tail = c }) = { Head = a; Tail = b::c }
282+
member _.Yield x = x
283+
member _.Delay expr = expr ()
284+
member _.Run (x: NonEmptyList<_>) = x
285285

286286
[<System.Obsolete("Use nelist instead.")>]
287287
let nel = NelBuilder ()
@@ -291,5 +291,5 @@ module NonEmptyListBuilder =
291291
[<AutoOpen>]
292292
module NonEmptyListBuilderExtensions =
293293
type NelBuilder with
294-
member __.Combine (a: 'T, b: 'T) = { Head = a; Tail = [b] }
295-
member __.Run x = { Head = x; Tail = [] }
294+
member _.Combine (a: 'T, b: 'T) = { Head = a; Tail = [b] }
295+
member _.Run x = { Head = x; Tail = [] }

‎src/FSharpPlus/Data/NonEmptySeq.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,9 @@ module NonEmptySeq =
533533
module NonEmptySeqBuilder =
534534
type NESeqBuilder () =
535535
[<CompilerMessage("A NonEmptySeq doesn't support the Zero operation.", 708, IsError = true)>]
536-
member __.Zero () = raise Internals.Errors.exnUnreachable
537-
member __.Combine (a: NonEmptySeq<'T>, b) = NonEmptySeq.append a b
538-
member __.Yield x = NonEmptySeq.singleton x
539-
member __.Delay expr = expr () : NonEmptySeq<'T>
536+
member _.Zero () = raise Internals.Errors.exnUnreachable
537+
member _.Combine (a: NonEmptySeq<'T>, b) = NonEmptySeq.append a b
538+
member _.Yield x = NonEmptySeq.singleton x
539+
member _.Delay expr = expr () : NonEmptySeq<'T>
540540

541541
let neseq = NESeqBuilder ()

‎src/FSharpPlus/Extensions/Dict.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ module Dict =
128128
source,
129129
altSource,
130130
{ new IEqualityComparer<KeyValuePair<'Key,'T>> with
131-
member __.Equals ((a:KeyValuePair<'Key,'T>),(b:KeyValuePair<'Key,'T>)) : bool = a.Key = b.Key
132-
member __.GetHashCode (a:KeyValuePair<'Key,'T>) = a.Key.GetHashCode () })
131+
member _.Equals ((a:KeyValuePair<'Key,'T>),(b:KeyValuePair<'Key,'T>)) : bool = a.Key = b.Key
132+
member _.GetHashCode (a:KeyValuePair<'Key,'T>) = a.Key.GetHashCode () })
133133
.ToDictionary((fun x -> x.Key), (fun y -> y.Value)) :> IDictionary<'Key, 'T>
134134

135135
/// Returns the intersection of two Dicts, using the combiner function for duplicate keys.

‎src/FSharpPlus/Extensions/Dictionary.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ module Dictionary =
147147
source,
148148
altSource,
149149
{ new IEqualityComparer<KeyValuePair<'Key,'T>> with
150-
member __.Equals ((a:KeyValuePair<'Key,'T>),(b:KeyValuePair<'Key,'T>)) : bool = a.Key = b.Key
151-
member __.GetHashCode (a:KeyValuePair<'Key,'T>) = a.Key.GetHashCode () })
150+
member _.Equals ((a:KeyValuePair<'Key,'T>),(b:KeyValuePair<'Key,'T>)) : bool = a.Key = b.Key
151+
member _.GetHashCode (a:KeyValuePair<'Key,'T>) = a.Key.GetHashCode () })
152152
.ToDictionary((fun x -> x.Key), (fun y -> y.Value))
153153

154154
/// Returns the intersection of two Dicts, using the combiner function for duplicate keys.

‎src/FSharpPlus/Extensions/Enumerator.fs‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ module Enumerator =
3939
type EmptyEnumerator<'T> () =
4040
let mutable started = false
4141
interface IEnumerator<'T> with
42-
member __.Current =
42+
member _.Current =
4343
check started
4444
(alreadyFinished () : 'T)
4545

4646
interface IEnumerator with
47-
member __.Current =
47+
member _.Current =
4848
check started
4949
(alreadyFinished () : obj)
50-
member __.MoveNext () =
50+
member _.MoveNext () =
5151
if not started then started <- true
5252
false
53-
member __.Reset() = noReset ()
53+
member _.Reset() = noReset ()
5454
interface System.IDisposable with
55-
member __.Dispose () = ()
55+
member _.Dispose () = ()
5656

5757
/// Constructs an EmptyEnumerator of type 'T.
5858
let Empty<'T> () = new EmptyEnumerator<'T>() :> IEnumerator<'T>
@@ -76,7 +76,7 @@ module Enumerator =
7676
[<DefaultValue(false)>]
7777
val mutable private currElement : 'T
7878

79-
member __.Finish () =
79+
member _.Finish () =
8080
finished <- true
8181
try
8282
match currInnerEnum with
@@ -110,7 +110,7 @@ module Enumerator =
110110
if finished then alreadyFinished () else x.currElement
111111

112112
interface IFinallyEnumerator with
113-
member __.AppendFinallyAction f =
113+
member _.AppendFinallyAction f =
114114
compensations <- f :: compensations
115115

116116
interface IEnumerator<'T> with
@@ -151,7 +151,7 @@ module Enumerator =
151151
takeOuter ()
152152
takeInner ()
153153

154-
member __.Reset () = noReset ()
154+
member _.Reset () = noReset ()
155155

156156
interface System.IDisposable with
157157
member x.Dispose () = if not finished then x.Finish ()
@@ -240,7 +240,7 @@ module Enumerator =
240240
else
241241
state <- Finished
242242
false
243-
member __.Reset () = noReset ()
243+
member _.Reset () = noReset ()
244244

245245
interface System.IDisposable with
246246
member this.Dispose () = this.Dispose ()
@@ -254,13 +254,13 @@ module Enumerator =
254254
let map f (e: IEnumerator<_>) : IEnumerator<_> =
255255
upcast
256256
{ new MapEnumerator<_>() with
257-
member __.DoMoveNext (curr: byref<_>) =
257+
member _.DoMoveNext (curr: byref<_>) =
258258
if e.MoveNext () then
259259
curr <- f e.Current
260260
true
261261
else
262262
false
263-
member __.Dispose () = e.Dispose ()
263+
member _.Dispose () = e.Dispose ()
264264
}
265265

266266
/// <summary>
@@ -274,13 +274,13 @@ module Enumerator =
274274
let i = ref -1
275275
upcast {
276276
new MapEnumerator<_> () with
277-
member __.DoMoveNext curr =
277+
member _.DoMoveNext curr =
278278
i.Value <- i.Value + 1
279279
if e.MoveNext () then
280280
curr <- f.Invoke (i.Value, e.Current)
281281
true
282282
else false
283-
member __.Dispose () = e.Dispose () }
283+
member _.Dispose () = e.Dispose () }
284284

285285
/// <summary>
286286
/// Maps over two Enumerators, with the mapping function is given the corresponding elements
@@ -297,14 +297,14 @@ module Enumerator =
297297
let f = OptimizedClosures.FSharpFunc<_,_,_>.Adapt f
298298
upcast {
299299
new MapEnumerator<_> () with
300-
member __.DoMoveNext curr =
300+
member _.DoMoveNext curr =
301301
let n1 = e1.MoveNext ()
302302
let n2 = e2.MoveNext ()
303303
if n1 && n2 then
304304
curr <- f.Invoke (e1.Current, e2.Current)
305305
true
306306
else false
307-
member __.Dispose () =
307+
member _.Dispose () =
308308
try e1.Dispose ()
309309
finally e2.Dispose () }
310310

@@ -324,13 +324,13 @@ module Enumerator =
324324
let i = ref -1
325325
upcast {
326326
new MapEnumerator<_> () with
327-
member __.DoMoveNext curr =
327+
member _.DoMoveNext curr =
328328
i.Value <- i.Value + 1
329329
if e1.MoveNext () && e2.MoveNext () then
330330
curr <- f.Invoke (i.Value, e1.Current, e2.Current)
331331
true
332332
else false
333-
member __.Dispose () =
333+
member _.Dispose () =
334334
try e1.Dispose ()
335335
finally e2.Dispose () }
336336

@@ -350,7 +350,7 @@ module Enumerator =
350350
let f = OptimizedClosures.FSharpFunc<_,_,_,_>.Adapt f
351351
upcast {
352352
new MapEnumerator<_> () with
353-
member __.DoMoveNext curr =
353+
member _.DoMoveNext curr =
354354
let n1 = e1.MoveNext ()
355355
let n2 = e2.MoveNext ()
356356
let n3 = e3.MoveNext ()
@@ -359,7 +359,7 @@ module Enumerator =
359359
curr <- f.Invoke (e1.Current, e2.Current, e3.Current)
360360
true
361361
else false
362-
member __.Dispose () =
362+
member _.Dispose () =
363363
try e1.Dispose ()
364364
finally
365365
try e2.Dispose ()
@@ -378,18 +378,18 @@ module Enumerator =
378378
let curr = ref None
379379
let get () = check started.Value; (match curr.Value with None -> alreadyFinished () | Some x -> x)
380380
{ new IEnumerator<'U> with
381-
member __.Current = get ()
381+
member _.Current = get ()
382382
interface IEnumerator with
383-
member __.Current = box (get ())
384-
member __.MoveNext () =
383+
member _.Current = box (get ())
384+
member _.MoveNext () =
385385
if not started.Value then started.Value <- true
386386
curr.Value <- None
387387
while curr.Value.IsNone && e.MoveNext () do
388388
curr.Value <- chooser e.Current
389389
Option.isSome curr.Value
390-
member __.Reset() = noReset ()
390+
member _.Reset() = noReset ()
391391
interface System.IDisposable with
392-
member __.Dispose () = e.Dispose () }
392+
member _.Dispose () = e.Dispose () }
393393

394394
/// <summary>
395395
/// Returns a new Enumerator yielding only the elements of the input Enumerator for which the
@@ -401,17 +401,17 @@ module Enumerator =
401401
let filter predicate (e: IEnumerator<'T>) =
402402
let started = ref false
403403
{ new IEnumerator<'T> with
404-
member __.Current = check started.Value; e.Current
404+
member _.Current = check started.Value; e.Current
405405
interface IEnumerator with
406-
member __.Current = check started.Value; box e.Current
407-
member __.MoveNext () =
406+
member _.Current = check started.Value; box e.Current
407+
member _.MoveNext () =
408408
let rec next () =
409409
if not started.Value then started.Value <- true
410410
e.MoveNext () && (predicate e.Current || next ())
411411
next ()
412-
member __.Reset () = noReset ()
412+
member _.Reset () = noReset ()
413413
interface System.IDisposable with
414-
member __.Dispose () = e.Dispose () }
414+
member _.Dispose () = e.Dispose () }
415415

416416
/// <summary>
417417
/// Returns a new Enumerator yielding elements <c>x</c> generated by the given computation
@@ -426,14 +426,14 @@ module Enumerator =
426426
let state = ref initialState
427427
upcast {
428428
new MapEnumerator<_> () with
429-
member __.DoMoveNext curr =
429+
member _.DoMoveNext curr =
430430
match generator state.Value with
431431
| None -> false
432432
| Some (r, s) ->
433433
curr <- r
434434
state.Value <- s
435435
true
436-
member __.Dispose () = () }
436+
member _.Dispose () = () }
437437

438438
/// <summary>
439439
/// Enumerates from zero up to the given <c>lastOption</c>, yielding elements
@@ -475,10 +475,10 @@ module Enumerator =
475475
// forced or re-forced immediately.
476476
current.Value.Force ()
477477
{ new IEnumerator<'U> with
478-
member __.Current = getCurrent ()
478+
member _.Current = getCurrent ()
479479
interface IEnumerator with
480-
member __.Current = box (getCurrent ())
481-
member __.MoveNext () =
480+
member _.Current = box (getCurrent ())
481+
member _.MoveNext () =
482482
if index.Value = completed then false
483483
elif index.Value = unstarted then
484484
setIndex 0
@@ -489,9 +489,9 @@ module Enumerator =
489489
else
490490
setIndex (index.Value + 1)
491491
true )
492-
member __.Reset () = noReset ()
492+
member _.Reset () = noReset ()
493493
interface System.IDisposable with
494-
member __.Dispose () = () }
494+
member _.Dispose () = () }
495495

496496
/// <summary>
497497
/// Zip two input Enumerators into a new Enumerator yielding pairs.
@@ -502,12 +502,12 @@ module Enumerator =
502502
let zip (e1: IEnumerator<_>) (e2: IEnumerator<_>) : IEnumerator<_> =
503503
upcast {
504504
new MapEnumerator<_> () with
505-
member __.DoMoveNext curr =
505+
member _.DoMoveNext curr =
506506
let n1 = e1.MoveNext ()
507507
let n2 = e2.MoveNext ()
508508
if n1 && n2 then curr <- (e1.Current, e2.Current); true
509509
else false
510-
member __.Dispose () =
510+
member _.Dispose () =
511511
try e1.Dispose ()
512512
finally e2.Dispose () }
513513

@@ -521,13 +521,13 @@ module Enumerator =
521521
let zip3 (e1: IEnumerator<_>) (e2: IEnumerator<_>) (e3: IEnumerator<_>) : IEnumerator<_> =
522522
upcast {
523523
new MapEnumerator<_> () with
524-
member __.DoMoveNext curr =
524+
member _.DoMoveNext curr =
525525
let n1 = e1.MoveNext ()
526526
let n2 = e2.MoveNext ()
527527
let n3 = e3.MoveNext ()
528528
if n1 && n2 && n3 then curr <- (e1.Current, e2.Current, e3.Current); true
529529
else false
530-
member __.Dispose () =
530+
member _.Dispose () =
531531
try e1.Dispose ()
532532
finally
533533
try e2.Dispose ()

0 commit comments

Comments
 (0)