From 75314d8f7cb1d1891fe32d4d56bbba774e06fe7e Mon Sep 17 00:00:00 2001
From: Louis Seubert <louis.seubert.ls@gmail.com>
Date: Fri, 12 Jul 2024 15:49:25 +0200
Subject: [PATCH] chore: small consistency improvements

---
 .../Extensions/Extensions.Enumerable.cs       |  4 +-
 src/Result/Extensions/Extensions.Task.cs      | 60 +++++++++----------
 src/Result/Result.Matching.cs                 | 18 ++----
 3 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/src/Result/Extensions/Extensions.Enumerable.cs b/src/Result/Extensions/Extensions.Enumerable.cs
index 362dc39..800122a 100644
--- a/src/Result/Extensions/Extensions.Enumerable.cs
+++ b/src/Result/Extensions/Extensions.Enumerable.cs
@@ -45,7 +45,7 @@ public static partial class Extensions
 	/// </remarks>
 	/// <seealso cref="Join{T}(System.Collections.Generic.IEnumerable{Geekeey.Extensions.Result.Result{T}})"/>
 	// ReSharper disable once InconsistentNaming
-	public static async Task<Result<IReadOnlyList<T>>> Join<T>(this IEnumerable<Task<Result<T>>> results)
+	public static async ValueTask<Result<IReadOnlyList<T>>> Join<T>(this IEnumerable<ValueTask<Result<T>>> results)
 	{
 		_ = results.TryGetNonEnumeratedCount(out var count);
 		var list = new List<T>(count);
@@ -70,7 +70,7 @@ public static partial class Extensions
 	/// </remarks>
 	/// <seealso cref="Join{T}(System.Collections.Generic.IEnumerable{Geekeey.Extensions.Result.Result{T}})"/>
 	// ReSharper disable once InconsistentNaming
-	public static async ValueTask<Result<IReadOnlyList<T>>> Join<T>(this IEnumerable<ValueTask<Result<T>>> results)
+	public static async Task<Result<IReadOnlyList<T>>> Join<T>(this IEnumerable<Task<Result<T>>> results)
 	{
 		_ = results.TryGetNonEnumeratedCount(out var count);
 		var list = new List<T>(count);
diff --git a/src/Result/Extensions/Extensions.Task.cs b/src/Result/Extensions/Extensions.Task.cs
index 05e530e..a015465 100644
--- a/src/Result/Extensions/Extensions.Task.cs
+++ b/src/Result/Extensions/Extensions.Task.cs
@@ -12,6 +12,36 @@ namespace Geekeey.Extensions.Result;
 [ExcludeFromCodeCoverage]
 public static partial class Extensions
 {
+	#region ValueTask<Result<T>>
+
+	/// <inheritdoc cref="Map{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,TNew})"/>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	// ReSharper disable once InconsistentNaming
+	public static async ValueTask<Result<TNew>> Map<T, TNew>(this ValueTask<Result<T>> result,
+		Func<T, TNew> func)
+		=> (await result).Map(func);
+
+	/// <inheritdoc cref="Map{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,TNew})"/>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	public static async ValueTask<Result<TNew>> MapAsync<T, TNew>(this ValueTask<Result<T>> result,
+		Func<T, ValueTask<TNew>> func)
+		=> await (await result).MapAsync(func);
+
+	/// <inheritdoc cref="Then{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,Geekeey.Extensions.Result.Result{TNew}})"/>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	// ReSharper disable once InconsistentNaming
+	public static async ValueTask<Result<TNew>> Then<T, TNew>(this ValueTask<Result<T>> result,
+		Func<T, Result<TNew>> func)
+		=> (await result).Then(func);
+
+	/// <inheritdoc cref="Then{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,Geekeey.Extensions.Result.Result{TNew}})"/>
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	public static async ValueTask<Result<TNew>> ThenAsync<T, TNew>(this ValueTask<Result<T>> result,
+		Func<T, ValueTask<Result<TNew>>> func)
+		=> await (await result).ThenAsync(func);
+
+	#endregion
+
 	#region Task<Result<T>>
 
 	/// <summary>
@@ -59,34 +89,4 @@ public static partial class Extensions
 		=> await (await result).ThenAsync(func);
 
 	#endregion
-
-	#region ValueTask<Result<T>>
-
-	/// <inheritdoc cref="Map{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,TNew})"/>
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	// ReSharper disable once InconsistentNaming
-	public static async ValueTask<Result<TNew>> Map<T, TNew>(this ValueTask<Result<T>> result,
-		Func<T, TNew> func)
-		=> (await result).Map(func);
-
-	/// <inheritdoc cref="Map{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,TNew})"/>
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	public static async ValueTask<Result<TNew>> MapAsync<T, TNew>(this ValueTask<Result<T>> result,
-		Func<T, ValueTask<TNew>> func)
-		=> await (await result).MapAsync(func);
-
-	/// <inheritdoc cref="Then{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,Geekeey.Extensions.Result.Result{TNew}})"/>
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	// ReSharper disable once InconsistentNaming
-	public static async ValueTask<Result<TNew>> Then<T, TNew>(this ValueTask<Result<T>> result,
-		Func<T, Result<TNew>> func)
-		=> (await result).Then(func);
-
-	/// <inheritdoc cref="Then{T,TNew}(System.Threading.Tasks.Task{Geekeey.Extensions.Result.Result{T}},System.Func{T,Geekeey.Extensions.Result.Result{TNew}})"/>
-	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	public static async ValueTask<Result<TNew>> ThenAsync<T, TNew>(this ValueTask<Result<T>> result,
-		Func<T, ValueTask<Result<TNew>>> func)
-		=> await (await result).ThenAsync(func);
-
-	#endregion
 }
\ No newline at end of file
diff --git a/src/Result/Result.Matching.cs b/src/Result/Result.Matching.cs
index 7fe3c3a..91f581f 100644
--- a/src/Result/Result.Matching.cs
+++ b/src/Result/Result.Matching.cs
@@ -46,8 +46,8 @@ public readonly partial struct Result<T>
 	/// <returns>A task completing with the result of applying either <paramref name="success"/> or
 	/// <paramref name="failure"/> on the success value or failure value of the result.</returns>
 	[Pure]
-	public async ValueTask<TResult> MatchAsync<TResult>(Func<T, ValueTask<TResult>> success, Func<Error, ValueTask<TResult>> failure)
-		=> _success ? await success(Value!) : await failure(Error!);
+	public ValueTask<TResult> MatchAsync<TResult>(Func<T, ValueTask<TResult>> success, Func<Error, ValueTask<TResult>> failure)
+		=> _success ? success(Value!) : failure(Error!);
 
 	/// <summary>
 	/// Asynchronously matches over the success value or failure value of the result and invokes an effectful action
@@ -56,11 +56,8 @@ public readonly partial struct Result<T>
 	/// </summary>
 	/// <param name="success">The function to call with the success value of the result if the result is a success.</param>
 	/// <param name="failure">The function to call with the failure value of the result if the result is a failure.</param>
-	public async ValueTask SwitchAsync(Func<T, ValueTask> success, Func<Error, ValueTask> failure)
-	{
-		if (_success) await success(Value!);
-		else await failure(Error!);
-	}
+	public ValueTask SwitchAsync(Func<T, ValueTask> success, Func<Error, ValueTask> failure)
+		=> _success ? success(Value!) : failure(Error!);
 }
 
 public readonly partial struct Result<T>
@@ -86,9 +83,6 @@ public readonly partial struct Result<T>
 	/// </summary>
 	/// <param name="success">The function to call with the success value of the result if the result is a success.</param>
 	/// <param name="failure">The function to call with the failure value of the result if the result is a failure.</param>
-	public async Task SwitchAsync(Func<T, Task> success, Func<Error, Task> failure)
-	{
-		if (_success) await success(Value!);
-		else await failure(Error!);
-	}
+	public Task SwitchAsync(Func<T, Task> success, Func<Error, Task> failure)
+		=> _success ? success(Value!) : failure(Error!);
 }
\ No newline at end of file