Skip to content

Commit 606b30e

Browse files
committed
refactor: align generic parameters naming
1 parent 7305e2c commit 606b30e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/FSharp.Control.R3/Observable.fs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let inline bind ([<InlineIfLambda>] f : 'T -> Observable<'TNext>) source = Obser
1212
/// Converts the elements of the sequence to the specified type
1313
let inline cast<'T, 'CastType> (source) = ObservableExtensions.Cast<'T, 'CastType> (source)
1414

15-
let inline catch ([<InlineIfLambda>] f : 'Exn -> Observable<'TNext>) o = ObservableExtensions.Catch (o, f)
15+
let inline catch ([<InlineIfLambda>] f : 'Exn -> Observable<'T>) o = ObservableExtensions.Catch (o, f)
1616

1717
/// Concatenates the second observable sequence to the first observable sequence
1818
/// upn the successful termination of the first
@@ -45,13 +45,13 @@ let inline distinct source = ObservableExtensions.Distinct source
4545
let inline empty () = Observable.Empty ()
4646

4747
/// Filters the observable elements of a sequence based on a predicate
48-
let inline filter ([<InlineIfLambda>] f : 't -> bool) source = ObservableExtensions.Where (source, f)
48+
let inline filter ([<InlineIfLambda>] f : 'T -> bool) source = ObservableExtensions.Where (source, f)
4949

5050
/// Maps the given observable with the given function
51-
let inline map ([<InlineIfLambda>] f : 't -> 'r) source = ObservableExtensions.Select (source, f)
51+
let inline map ([<InlineIfLambda>] f : 'T -> 'R) source = ObservableExtensions.Select (source, f)
5252

5353
/// Maps the given observable with the given function and the index of the element
54-
let inline mapi ([<InlineIfLambda>] f : int -> 't -> 'r) source = ObservableExtensions.Select (source, (fun i x -> f x i))
54+
let inline mapi ([<InlineIfLambda>] f : int -> 'T -> 'R) source = ObservableExtensions.Select (source, (fun i x -> f x i))
5555

5656
/// Merges two observable sequences into one observable sequence
5757
let inline merge (source1, source2) = ObservableExtensions.Merge (source1, source2)
@@ -68,7 +68,7 @@ let inline skip (count : int) (source) = ObservableExtensions.Skip (source, coun
6868
let inline take (count : int) (source) = ObservableExtensions.Take (source, count)
6969

7070
/// Filters the observable elements of a sequence based on a predicate
71-
let inline where ([<InlineIfLambda>] f : 't -> bool) source = ObservableExtensions.Where (source, f)
71+
let inline where ([<InlineIfLambda>] f : 'T -> bool) source = ObservableExtensions.Where (source, f)
7272

7373
open System.Runtime.CompilerServices
7474
open System.Runtime.InteropServices

src/FSharp.Control.R3/TaskObservable.fs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ module Observable =
1010

1111
/// Applies an accumulator function over an observable sequence, returning the
1212
/// result of the aggregation as a single element in the result sequence
13-
let inline aggregate cancellationToken seed ([<InlineIfLambda>] f : 'r -> 't -> 'r) source =
13+
let inline aggregate cancellationToken seed ([<InlineIfLambda>] f : 'R -> 'T -> 'R) source =
1414
ObservableExtensions.AggregateAsync (source, seed, f, cancellationToken)
1515

1616
/// Determines whether all elements of an observable satisfy a predicate
17-
let inline all cancellationToken ([<InlineIfLambda>] f : 't -> bool) source = ObservableExtensions.AllAsync (source, f, cancellationToken)
17+
let inline all cancellationToken ([<InlineIfLambda>] f : 'T -> bool) source = ObservableExtensions.AllAsync (source, f, cancellationToken)
1818

1919
/// <summary>
2020
/// Invokes an action for each element in the observable sequence, and propagates all observer
@@ -24,7 +24,7 @@ module Observable =
2424
/// This method can be used for debugging, logging, etc. of query behavior
2525
/// by intercepting the message stream to run arbitrary actions for messages on the pipeline.
2626
/// </remarks>
27-
let inline iter cancellationToken ([<InlineIfLambda>] action : 't -> unit) source =
27+
let inline iter cancellationToken ([<InlineIfLambda>] action : 'T -> unit) source =
2828
ObservableExtensions.ForEachAsync (source, action, cancellationToken)
2929

3030
/// Determines whether an observable sequence contains a specified value
@@ -38,8 +38,8 @@ module Observable =
3838
let length cancellationToken source = ObservableExtensions.CountAsync (source, cancellationToken)
3939

4040
/// Maps the given observable with the given asynchronous function
41-
let mapAsync (options : ProcessingOptions) (f : CancellationToken -> 't -> Task<'r>) source =
42-
let selector x ct = ValueTask<'r> (f ct x)
41+
let mapAsync (options : ProcessingOptions) (f : CancellationToken -> 'T -> Task<'R>) source =
42+
let selector x ct = ValueTask<'R> (f ct x)
4343
ObservableExtensions.SelectAwait (
4444
source,
4545
selector,

0 commit comments

Comments
 (0)