From 598312ba6143f3be03069332a2fb4ce5a4637683 Mon Sep 17 00:00:00 2001 From: neuecc Date: Mon, 25 May 2020 19:38:08 +0900 Subject: [PATCH] DOTween's WithCancellation remove = default --- .../UniTask/Runtime/External/AddressableAsyncExtensions.cs | 4 ++-- .../UniTask/Runtime/External/DoTweenAsyncExtensions.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/AddressableAsyncExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/AddressableAsyncExtensions.cs index 8b81e63..893f4ab 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/AddressableAsyncExtensions.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/AddressableAsyncExtensions.cs @@ -202,10 +202,10 @@ namespace Cysharp.Threading.Tasks return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, PlayerLoopTiming.Update, null, cancellationToken, out var token), token); } - public static UniTask ToUniTask(this AsyncOperationHandle handle, IProgress progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellation = default(CancellationToken)) + public static UniTask ToUniTask(this AsyncOperationHandle handle, IProgress progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken)) { if (handle.IsDone) return UniTask.FromResult(handle.Result); - return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, timing, progress, cancellation, out var token), token); + return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, timing, progress, cancellationToken, out var token), token); } public struct AsyncOperationHandleAwaiter : ICriticalNotifyCompletion diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs index 1955f7a..523873c 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs @@ -33,7 +33,7 @@ namespace Cysharp.Threading.Tasks return new TweenAwaiter(tween); } - public static UniTask WithCancellation(this Tween tween, CancellationToken cancellationToken = default) + public static UniTask WithCancellation(this Tween tween, CancellationToken cancellationToken) { Error.ThrowArgumentNullException(tween, nameof(tween));