Change constructor arguments order

pfpack · Aug 24, 2023 · 5b3da07 · 5b3da07
1 parent cf23da2
commit 5b3da07
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 24 deletions.
diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/AsyncPipeline.T.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/AsyncPipeline.T.cs
@@ -11,17 +11,17 @@ namespace System;
 
     private readonly ValueTask<T> valueTask;
 
-    private readonly CancellationToken cancellationToken;
-
     private readonly AsyncPipelineOptions? options;
 
+    private readonly CancellationToken cancellationToken;
+
     // Creates a non-stopped pipeline
-    internal AsyncPipeline(ValueTask<T> valueTask, CancellationToken cancellationToken, AsyncPipelineOptions? options)
+    internal AsyncPipeline(ValueTask<T> valueTask, AsyncPipelineOptions? options, CancellationToken cancellationToken)
     {
         isStopped = false;
         this.valueTask = valueTask;
-        this.cancellationToken = cancellationToken;
         this.options = options;
+        this.cancellationToken = cancellationToken;
     }
 
     // Creates the stopped pipeline

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Configure/Configure.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Configure/Configure.cs
@@ -7,6 +7,6 @@ partial struct AsyncPipeline<T>
     public AsyncPipeline<T> Configure([AllowNull] AsyncPipelineOptions options)
         =>
         isStopped is false
-            ? new(valueTask, cancellationToken, options)
+            ? new(valueTask, options, cancellationToken)
             : new(default);
 }
diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Equality/Equality.Common.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Equality/Equality.Common.cs
@@ -18,11 +18,11 @@ private static EqualityComparer<ValueTask<T>> ValueTaskComparer
         =>
         EqualityComparer<ValueTask<T>>.Default;
 
-    private static EqualityComparer<CancellationToken> CancellationTokenComparer
-        =>
-        EqualityComparer<CancellationToken>.Default;
-
     private static EqualityComparer<AsyncPipelineOptions> OptionsComparer
         =>
         EqualityComparer<AsyncPipelineOptions>.Default;
+
+    private static EqualityComparer<CancellationToken> CancellationTokenComparer
+        =>
+        EqualityComparer<CancellationToken>.Default;
 }
diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Equality/Equality.Equals.Impl.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Equality/Equality.Equals.Impl.cs
@@ -13,8 +13,8 @@ public bool Equals(AsyncPipeline<T> other)
         {
             return
                 ValueTaskComparer.Equals(valueTask, other.valueTask) &&
-                CancellationTokenComparer.Equals(cancellationToken, other.cancellationToken) &&
-                OptionsComparer.Equals(Options, other.Options);
+                OptionsComparer.Equals(Options, other.Options) &&
+                CancellationTokenComparer.Equals(cancellationToken, other.cancellationToken);
         }
 
         return true;

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Equality/Equality.GetHashCode.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Equality/Equality.GetHashCode.cs
@@ -11,8 +11,8 @@ private int NonStoppedHashCode()
         HashCode.Combine(
             EqualityContractHashCode(),
             ValueTaskComparer.GetHashCode(valueTask),
-            CancellationTokenComparer.GetHashCode(cancellationToken),
-            OptionsComparer.GetHashCode(Options));
+            OptionsComparer.GetHashCode(Options),
+            CancellationTokenComparer.GetHashCode(cancellationToken));
 
     private static int StoppedHashCode()
         =>

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/Pipe.Task.Cancelable.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/Pipe.Task.Cancelable.cs
@@ -13,7 +13,7 @@ public AsyncPipeline<TResult> Pipe<TResult>(Func<T, CancellationToken, Task<TRes
     internal AsyncPipeline<TResult> InternalPipe<TResult>(Func<T, CancellationToken, Task<TResult>> pipeAsync)
         =>
         isStopped is false
-            ? new(InnerInvokeAsync(pipeAsync), cancellationToken, options)
+            ? new(InnerInvokeAsync(pipeAsync), options, cancellationToken)
             : new(default);
 
     private async ValueTask<TResult> InnerInvokeAsync<TResult>(Func<T, CancellationToken, Task<TResult>> pipeAsync)

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/Pipe.Task.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/Pipe.Task.cs
@@ -12,7 +12,7 @@ public AsyncPipeline<TResult> Pipe<TResult>(Func<T, Task<TResult>> pipeAsync)
     internal AsyncPipeline<TResult> InternalPipe<TResult>(Func<T, Task<TResult>> pipeAsync)
         =>
         isStopped is false
-            ? new(InnerInvokeAsync(pipeAsync), cancellationToken, options)
+            ? new(InnerInvokeAsync(pipeAsync), options, cancellationToken)
             : new(default);
 
     private async ValueTask<TResult> InnerInvokeAsync<TResult>(Func<T, Task<TResult>> pipeAsync)

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/Pipe.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/Pipe.cs
@@ -12,7 +12,7 @@ public AsyncPipeline<TResult> Pipe<TResult>(Func<T, TResult> pipe)
     internal AsyncPipeline<TResult> InternalPipe<TResult>(Func<T, TResult> pipe)
         =>
         isStopped is false
-            ? new(InnerInvokeAsync(pipe), cancellationToken, options)
+            ? new(InnerInvokeAsync(pipe), options, cancellationToken)
             : new(default);
 
     private async ValueTask<TResult> InnerInvokeAsync<TResult>(Func<T, TResult> pipe)

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/PipeValue.Cancelable.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/PipeValue.Cancelable.cs
@@ -13,7 +13,7 @@ public AsyncPipeline<TResult> PipeValue<TResult>(Func<T, CancellationToken, Valu
     internal AsyncPipeline<TResult> InternalPipeValue<TResult>(Func<T, CancellationToken, ValueTask<TResult>> pipeAsync)
         =>
         isStopped is false
-            ? new(InnerInvokeValueAsync(pipeAsync), cancellationToken, options)
+            ? new(InnerInvokeValueAsync(pipeAsync), options, cancellationToken)
             : new(default);
 
     private async ValueTask<TResult> InnerInvokeValueAsync<TResult>(Func<T, CancellationToken, ValueTask<TResult>> pipeAsync)

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/PipeValue.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/Pipe/PipeValue.cs
@@ -12,7 +12,7 @@ public AsyncPipeline<TResult> PipeValue<TResult>(Func<T, ValueTask<TResult>> pip
     internal AsyncPipeline<TResult> InternalPipeValue<TResult>(Func<T, ValueTask<TResult>> pipeAsync)
         =>
         isStopped is false
-            ? new(InnerInvokeValueAsync(pipeAsync), cancellationToken, options)
+            ? new(InnerInvokeValueAsync(pipeAsync), options, cancellationToken)
             : new(default);
 
     private async ValueTask<TResult> InnerInvokeValueAsync<TResult>(Func<T, ValueTask<TResult>> pipeAsync)

diff --git a/...syncPipeline/AsyncPipeline/From.Result.cs → ...ine/AsyncPipeline/Pipeline.From.Result.cs b/...syncPipeline/AsyncPipeline/From.Result.cs → ...ine/AsyncPipeline/Pipeline.From.Result.cs
@@ -11,7 +11,7 @@ public static AsyncPipeline<TSuccess, TFailure> From<TSuccess, TFailure>(
         where TFailure : struct
         =>
         new(
-            pipeline: new(valueTask, cancellationToken, null));
+            pipeline: new(valueTask, null, cancellationToken));
 
     public static AsyncPipeline<TSuccess, TFailure> From<TSuccess, TFailure>(
         Task<Result<TSuccess, TFailure>> task,
@@ -21,6 +21,6 @@ public static AsyncPipeline<TSuccess, TFailure> From<TSuccess, TFailure>(
         _ = task ?? throw new ArgumentNullException(nameof(task));
 
         return new(
-            pipeline: new(valueTask: new(task), cancellationToken, null));
+            pipeline: new(valueTask: new(task), null, cancellationToken));
     }
 }
diff --git a/...eline/AsyncPipeline/AsyncPipeline/From.cs → ...ncPipeline/AsyncPipeline/Pipeline.From.cs b/...eline/AsyncPipeline/AsyncPipeline/From.cs → ...ncPipeline/AsyncPipeline/Pipeline.From.cs
@@ -7,12 +7,12 @@ partial class AsyncPipeline
 {
     public static AsyncPipeline<T> From<T>(ValueTask<T> valueTask, CancellationToken cancellationToken = default)
         =>
-        new(valueTask, cancellationToken, null);
+        new(valueTask, null, cancellationToken);
 
     public static AsyncPipeline<T> From<T>(Task<T> task, CancellationToken cancellationToken = default)
     {
         _ = task ?? throw new ArgumentNullException(nameof(task));
 
-        return new(valueTask: new(task), cancellationToken, null);
+        return new(valueTask: new(task), null, cancellationToken);
     }
 }
diff --git a/...syncPipeline/AsyncPipeline/Pipe.Result.cs → ...ine/AsyncPipeline/Pipeline.Pipe.Result.cs b/...syncPipeline/AsyncPipeline/Pipe.Result.cs → ...ine/AsyncPipeline/Pipeline.Pipe.Result.cs
@@ -10,5 +10,5 @@ public static AsyncPipeline<TSuccess, TFailure> Pipe<TSuccess, TFailure>(
         where TFailure : struct
         =>
         new(
-            pipeline: new(valueTask: new(value), cancellationToken, null));
+            pipeline: new(valueTask: new(value), null, cancellationToken));
 }
diff --git a/...eline/AsyncPipeline/AsyncPipeline/Pipe.cs → ...ncPipeline/AsyncPipeline/Pipeline.Pipe.cs b/...eline/AsyncPipeline/AsyncPipeline/Pipe.cs → ...ncPipeline/AsyncPipeline/Pipeline.Pipe.cs
@@ -6,5 +6,5 @@ partial class AsyncPipeline
 {
     public static AsyncPipeline<T> Pipe<T>(T value, CancellationToken cancellationToken = default)
         =>
-        new(valueTask: new(value), cancellationToken, null);
+        new(valueTask: new(value), null, cancellationToken);
 }