2.2.1

Cysharp · Feb 26, 2021 · e88e553 · e88e553
1 parent a1a38d0
commit e88e553
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/UniTask.NetCoreTests/WithCancellationTest.cs b/src/UniTask.NetCoreTests/WithCancellationTest.cs
@@ -16,7 +16,7 @@ public async Task Standard()
         {
             CancellationTokenSource cts = new CancellationTokenSource();
 
-            var v = await UniTask.Run(() => 10).IgnoreWhenCanceled(cts.Token);
+            var v = await UniTask.Run(() => 10).AttachExternalCancellation(cts.Token);
 
             v.Should().Be(10);
         }
@@ -30,7 +30,7 @@ public async Task Cancel()
             {
                 await Task.Delay(TimeSpan.FromSeconds(1));
                 return 10;
-            }).IgnoreWhenCanceled(cts.Token);
+            }).AttachExternalCancellation(cts.Token);
 
             cts.Cancel();
 

diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTaskExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTaskExtensions.cs
@@ -192,7 +192,7 @@ public static AsyncLazy<T> ToAsyncLazy<T>(this UniTask<T> task)
         /// <summary>
         /// Ignore task result when cancel raised first.
         /// </summary>
-        public static UniTask IgnoreWhenCanceled(this UniTask task, CancellationToken cancellationToken)
+        public static UniTask AttachExternalCancellation(this UniTask task, CancellationToken cancellationToken)
         {
             if (!cancellationToken.CanBeCanceled)
             {
@@ -209,13 +209,13 @@ public static UniTask IgnoreWhenCanceled(this UniTask task, CancellationToken ca
                 return task;
             }
 
-            return new UniTask(new IgnoreWhenCanceledSource(task, cancellationToken), 0);
+            return new UniTask(new AttachExternalCancellationSource(task, cancellationToken), 0);
         }
 
         /// <summary>
         /// Ignore task result when cancel raised first.
         /// </summary>
-        public static UniTask<T> IgnoreWhenCanceled<T>(this UniTask<T> task, CancellationToken cancellationToken)
+        public static UniTask<T> AttachExternalCancellation<T>(this UniTask<T> task, CancellationToken cancellationToken)
         {
             if (!cancellationToken.CanBeCanceled)
             {
@@ -232,18 +232,18 @@ public static UniTask<T> IgnoreWhenCanceled<T>(this UniTask<T> task, Cancellatio
                 return task;
             }
 
-            return new UniTask<T>(new IgnoreWhenCanceledSource<T>(task, cancellationToken), 0);
+            return new UniTask<T>(new AttachExternalCancellationSource<T>(task, cancellationToken), 0);
         }
 
-        sealed class IgnoreWhenCanceledSource : IUniTaskSource
+        sealed class AttachExternalCancellationSource : IUniTaskSource
         {
             static readonly Action<object> cancellationCallbackDelegate = CancellationCallback;
 
             CancellationToken cancellationToken;
             CancellationTokenRegistration tokenRegistration;
             UniTaskCompletionSourceCore<AsyncUnit> core;
 
-            public IgnoreWhenCanceledSource(UniTask task, CancellationToken cancellationToken)
+            public AttachExternalCancellationSource(UniTask task, CancellationToken cancellationToken)
             {
                 this.cancellationToken = cancellationToken;
                 this.tokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(cancellationCallbackDelegate, this);
@@ -269,7 +269,7 @@ async UniTaskVoid RunTask(UniTask task)
 
             static void CancellationCallback(object state)
             {
-                var self = (IgnoreWhenCanceledSource)state;
+                var self = (AttachExternalCancellationSource)state;
                 self.core.TrySetCanceled(self.cancellationToken);
             }
 
@@ -294,15 +294,15 @@ public UniTaskStatus UnsafeGetStatus()
             }
         }
 
-        sealed class IgnoreWhenCanceledSource<T> : IUniTaskSource<T>
+        sealed class AttachExternalCancellationSource<T> : IUniTaskSource<T>
         {
             static readonly Action<object> cancellationCallbackDelegate = CancellationCallback;
 
             CancellationToken cancellationToken;
             CancellationTokenRegistration tokenRegistration;
             UniTaskCompletionSourceCore<T> core;
 
-            public IgnoreWhenCanceledSource(UniTask<T> task, CancellationToken cancellationToken)
+            public AttachExternalCancellationSource(UniTask<T> task, CancellationToken cancellationToken)
             {
                 this.cancellationToken = cancellationToken;
                 this.tokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(cancellationCallbackDelegate, this);
@@ -327,7 +327,7 @@ async UniTaskVoid RunTask(UniTask<T> task)
 
             static void CancellationCallback(object state)
             {
-                var self = (IgnoreWhenCanceledSource<T>)state;
+                var self = (AttachExternalCancellationSource<T>)state;
                 self.core.TrySetCanceled(self.cancellationToken);
             }