foldcc/UniTask
1
0
Fork 0
mirror of https://github.com/Cysharp/UniTask.git synced 2026-05-16 20:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove legacy UniTask(occurs many compile error)

Browse Source
This commit is contained in:
Yoshifumi Kawai
2020-04-19 03:24:53 +09:00
parent 86fa934510
commit ef248e2e0a
10 changed files with 136 additions and 2102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
Assets/UniRx.Async/UniTask.Factory.cs
View File

@@ -7,11 +7,11 @@ using UnityEngine.Events;
namespace UniRx.Async
{
public partial struct UniTask2
public partial struct UniTask
{
static readonly UniTask2 CanceledUniTask = new Func<UniTask2>(() =>
static readonly UniTask CanceledUniTask = new Func<UniTask>(() =>
{
var promise = new UniTaskCompletionSource2();
var promise = new UniTaskCompletionSource();
promise.SetCanceled(CancellationToken.None);
promise.MarkHandled();
return promise.Task;
@@ -19,41 +19,41 @@ namespace UniRx.Async
static class CanceledUniTaskCache<T>
{
public static readonly UniTask2<T> Task;
public static readonly UniTask<T> Task;
static CanceledUniTaskCache()
{
var promise = new UniTaskCompletionSource2<T>();
var promise = new UniTaskCompletionSource<T>();
promise.SetCanceled(CancellationToken.None);
promise.MarkHandled();
Task = promise.Task;
}
}
public static readonly UniTask2 CompletedTask = new UniTask2();
public static readonly UniTask CompletedTask = new UniTask();
public static UniTask2 FromException(Exception ex)
public static UniTask FromException(Exception ex)
{
var promise = new UniTaskCompletionSource2();
var promise = new UniTaskCompletionSource();
promise.SetException(ex);
promise.MarkHandled();
return promise.Task;
}
public static UniTask2<T> FromException<T>(Exception ex)
public static UniTask<T> FromException<T>(Exception ex)
{
var promise = new UniTaskCompletionSource2<T>();
var promise = new UniTaskCompletionSource<T>();
promise.SetException(ex);
promise.MarkHandled();
return promise.Task;
}
public static UniTask2<T> FromResult<T>(T value)
public static UniTask<T> FromResult<T>(T value)
{
return new UniTask2<T>(value);
return new UniTask<T>(value);
}
public static UniTask2 FromCanceled(CancellationToken cancellationToken = default)
public static UniTask FromCanceled(CancellationToken cancellationToken = default)
{
if (cancellationToken == CancellationToken.None)
{
@@ -61,14 +61,14 @@ namespace UniRx.Async
}
else
{
var promise = new UniTaskCompletionSource2();
var promise = new UniTaskCompletionSource();
promise.SetCanceled(cancellationToken);
promise.MarkHandled();
return promise.Task;
}
}
public static UniTask2<T> FromCanceled<T>(CancellationToken cancellationToken = default)
public static UniTask<T> FromCanceled<T>(CancellationToken cancellationToken = default)
{
if (cancellationToken == CancellationToken.None)
{
@@ -76,7 +76,7 @@ namespace UniRx.Async
}
else
{
var promise = new UniTaskCompletionSource2<T>();
var promise = new UniTaskCompletionSource<T>();
promise.SetCanceled(cancellationToken);
promise.MarkHandled();
return promise.Task;
@@ -120,143 +120,15 @@ namespace UniRx.Async
}
}
// TODO:remove
public partial struct UniTask
{
static readonly UniTask CanceledUniTask = new Func<UniTask>(() =>
{
var promise = new UniTaskCompletionSource<AsyncUnit>();
promise.TrySetCanceled();
promise.MarkHandled();
return new UniTask(promise);
})();
public static UniTask CompletedTask
{
get
{
return new UniTask();
}
}
public static UniTask FromException(Exception ex)
{
var promise = new UniTaskCompletionSource<AsyncUnit>();
promise.TrySetException(ex);
promise.MarkHandled();
return new UniTask(promise);
}
public static UniTask<T> FromException<T>(Exception ex)
{
var promise = new UniTaskCompletionSource<T>();
promise.TrySetException(ex);
promise.MarkHandled();
return new UniTask<T>(promise);
}
public static UniTask<T> FromResult<T>(T value)
{
return new UniTask<T>(value);
}
public static UniTask FromCanceled()
{
return CanceledUniTask;
}
public static UniTask<T> FromCanceled<T>()
{
return CanceledUniTaskCache<T>.Task;
}
public static UniTask FromCanceled(CancellationToken token)
{
var promise = new UniTaskCompletionSource<AsyncUnit>();
promise.TrySetException(new OperationCanceledException(token));
promise.MarkHandled();
return new UniTask(promise);
}
public static UniTask<T> FromCanceled<T>(CancellationToken token)
{
var promise = new UniTaskCompletionSource<T>();
promise.TrySetException(new OperationCanceledException(token));
promise.MarkHandled();
return new UniTask<T>(promise);
}
/// <summary>shorthand of new UniTask[T](Func[UniTask[T]] factory)</summary>
public static UniTask<T> Lazy<T>(Func<UniTask<T>> factory)
{
return new UniTask<T>(factory);
}
/// <summary>
/// helper of create add UniTaskVoid to delegate.
/// For example: FooEvent += () => UniTask.Void(async () => { /* */ })
/// </summary>
public static void Void(Func<UniTask> asyncAction)
{
asyncAction().Forget();
}
public static Action VoidAction(Func<UniTask> asyncAction)
{
return () => Void(asyncAction);
}
public static UnityAction VoidUnityAction(Func<UniTask> asyncAction)
{
return () => Void(asyncAction);
}
/// <summary>
/// helper of create add UniTaskVoid to delegate.
/// For example: FooEvent += (sender, e) => UniTask.Void(async arg => { /* */ }, (sender, e))
/// </summary>
public static void Void<T>(Func<T, UniTask> asyncAction, T state)
{
asyncAction(state).Forget();
}
static class CanceledUniTaskCache<T>
{
public static readonly UniTask<T> Task;
static CanceledUniTaskCache()
{
var promise = new UniTaskCompletionSource<T>();
promise.TrySetCanceled();
promise.MarkHandled();
Task = new UniTask<T>(promise);
}
}
}
// TODO:remove
internal static class CompletedTasks
{
public static readonly UniTask Completed = new UniTask();
public static readonly UniTask<AsyncUnit> AsyncUnit = UniTask.FromResult(UniRx.Async.AsyncUnit.Default);
public static readonly UniTask<bool> True = UniTask.FromResult(true);
public static readonly UniTask<bool> False = UniTask.FromResult(false);
public static readonly UniTask<int> Zero = UniTask.FromResult(0);
public static readonly UniTask<int> MinusOne = UniTask.FromResult(-1);
public static readonly UniTask<int> One = UniTask.FromResult(1);
}
// TODO:rename
internal static class CompletedTasks2
{
public static readonly UniTask2 Completed = new UniTask2();
public static readonly UniTask2<AsyncUnit> AsyncUnit = UniTask2.FromResult(UniRx.Async.AsyncUnit.Default);
public static readonly UniTask2<bool> True = UniTask2.FromResult(true);
public static readonly UniTask2<bool> False = UniTask2.FromResult(false);
public static readonly UniTask2<int> Zero = UniTask2.FromResult(0);
public static readonly UniTask2<int> MinusOne = UniTask2.FromResult(-1);
public static readonly UniTask2<int> One = UniTask2.FromResult(1);
}
}
#endif