pre-empt final token renames (won't compile until CI completes)

Author: mgravell

src/ServiceStack.Redis/RedisClientSet.Async.cs

@@ -61,7 +61,7 @@ ValueTask<HashSet<string>> IRedisSetAsync.IntersectAsync(IRedisSetAsync[] withSe
         }
 
         ValueTask<HashSet<string>> IRedisSetAsync.IntersectAsync(params IRedisSetAsync[] withSets)
-            => AsAsync().IntersectAsync(withSets, cancellationToken: default);
+            => AsAsync().IntersectAsync(withSets, token: default);
 
         private List<string> MergeSetIds(IRedisSetAsync[] withSets)
         {
@@ -86,7 +86,7 @@ ValueTask IRedisSetAsync.StoreDiffAsync(IRedisSetAsync fromSet, IRedisSetAsync[]
         }
 
         ValueTask IRedisSetAsync.StoreDiffAsync(IRedisSetAsync fromSet, params IRedisSetAsync[] withSets)
-            => AsAsync().StoreDiffAsync(fromSet, withSets, cancellationToken: default);
+            => AsAsync().StoreDiffAsync(fromSet, withSets, token: default);
 
         ValueTask IRedisSetAsync.StoreIntersectAsync(IRedisSetAsync[] withSets, CancellationToken token)
         {
@@ -95,7 +95,7 @@ ValueTask IRedisSetAsync.StoreIntersectAsync(IRedisSetAsync[] withSets, Cancella
         }
 
         ValueTask IRedisSetAsync.StoreIntersectAsync(params IRedisSetAsync[] withSets)
-            => AsAsync().StoreIntersectAsync(withSets, cancellationToken: default);
+            => AsAsync().StoreIntersectAsync(withSets, token: default);
 
         ValueTask IRedisSetAsync.StoreUnionAsync(IRedisSetAsync[] withSets, CancellationToken token)
         {
@@ -104,7 +104,7 @@ ValueTask IRedisSetAsync.StoreUnionAsync(IRedisSetAsync[] withSets, Cancellation
         }
 
         ValueTask IRedisSetAsync.StoreUnionAsync(params IRedisSetAsync[] withSets)
-            => AsAsync().StoreUnionAsync(withSets, cancellationToken: default);
+            => AsAsync().StoreUnionAsync(withSets, token: default);
 
         ValueTask<HashSet<string>> IRedisSetAsync.UnionAsync(IRedisSetAsync[] withSets, CancellationToken token)
         {
@@ -113,6 +113,6 @@ ValueTask<HashSet<string>> IRedisSetAsync.UnionAsync(IRedisSetAsync[] withSets,
         }
 
         ValueTask<HashSet<string>> IRedisSetAsync.UnionAsync(params IRedisSetAsync[] withSets)
-            => AsAsync().UnionAsync(withSets, cancellationToken: default);
+            => AsAsync().UnionAsync(withSets, token: default);
     }
 }

tests/ServiceStack.Redis.Tests/AsyncImplementationsTests.Async.cs

@@ -83,7 +83,7 @@ public void TestSameAPI(Type syncInterface, Type asyncInterface)
             }
 
             var expected = new List<string>();
-            ParameterToken cancellationToken = new ParameterToken("token", typeof(CancellationToken), ParameterAttributes.Optional);
+            ParameterToken cancellationParameter = new ParameterToken("token", typeof(CancellationToken), ParameterAttributes.Optional);
             foreach (var method in syncInterface.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
             {
                 AddExpected(method);
@@ -367,11 +367,11 @@ static bool IsParams(in MethodToken tok)
 
                     if (IsParams(tok))
                     {
-                        // include it with params but without cancellationToken
+                        // include it with params but without CancellationToken
                         tok = new MethodToken(name, returnType, parameters, tok.IsGenericMethod, tok.IsGenericMethodDefinition, tok.GetGenericArguments(), tok.AllAttributes());
                         expected.Add(GetSignature(tok));
 
-                        // and now remove the params so we can get with cancellationToken
+                        // and now remove the params so we can get with CancellationToken
                         ref ParameterToken p = ref parameters[parameters.Length - 1];
                         p = p.WithAllAttributes(p.AllAttributes().Where(a => !(a is ParamArrayAttribute)).ToArray());
                     }
@@ -483,11 +483,11 @@ static void Insert(ref ParameterToken[] parameters, int index, ParameterToken va
                         }
                     }
 
-                    // append optional cancellationToken
+                    // append optional CancellationToken
                     if (addCancellation)
                     {
                         Array.Resize(ref parameters, parameters.Length + 1);
-                        parameters[parameters.Length - 1] = cancellationToken;
+                        parameters[parameters.Length - 1] = cancellationParameter;
                     }
                     tok = new MethodToken(name, returnType, parameters, tok.IsGenericMethod, tok.IsGenericMethodDefinition, tok.GetGenericArguments(), tok.AllAttributes());
                     expected.Add(GetSignature(tok));

tests/ServiceStack.Redis.Tests/RedisClientTestsBase.Async.cs

@@ -113,10 +113,10 @@ public override void OnAfterEachTest()
             base.OnAfterEachTest();
         }
 
-        protected static async ValueTask<List<T>> ToListAsync<T>(IAsyncEnumerable<T> source, CancellationToken cancellationToken = default)
+        protected static async ValueTask<List<T>> ToListAsync<T>(IAsyncEnumerable<T> source, CancellationToken token = default)
         {
             var list = new List<T>();
-            await foreach (var value in source.ConfigureAwait(false).WithCancellation(cancellationToken))
+            await foreach (var value in source.ConfigureAwait(false).WithCancellation(token))
             {
                 list.Add(value);
             }