Skip to content

Commit 87c4681

Browse files
rutkowskitrutkowskit
committed
Fix BindTry after rebase from upstream master, Fix documentation for BindTry.
1 parent 48e629d commit 87c4681

File tree

11 files changed

+137
-164
lines changed

11 files changed

+137
-164
lines changed

‎CSharpFunctionalExtensions.Tests/ResultTests/Extensions/BindTryTests.Base.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,22 @@ namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions
66
{
77
public class BindTryTestsBase : BindTestsBase
88
{
9-
protected static Result Throwing() => throw new Exception(ErrorMessage);
10-
protected static Result<T> Throwing_T() => throw new Exception(ErrorMessage);
9+
protected static Result Throwing() => throw new Exception(ErrorMessage);
1110
protected static UnitResult<E> Throwing_E() => throw new Exception(ErrorMessage);
1211
protected static Result<T, E> Throwing_T_E() => throw new Exception(ErrorMessage);
13-
protected static Result<K> Throwing_K() => throw new Exception(ErrorMessage);
14-
protected static Result<T, K> Throwing_T_K() => throw new Exception(ErrorMessage);
12+
protected static Result<K> Throwing_K() => throw new Exception(ErrorMessage);
1513
protected static Result<K, E> Throwing_K_E() => throw new Exception(ErrorMessage);
1614

17-
protected static Task<Result> Task_Throwing() => throw new Exception(ErrorMessage);
18-
protected static Task<Result<T>> Task_Throwing_T() => throw new Exception(ErrorMessage);
15+
protected static Task<Result> Task_Throwing() => throw new Exception(ErrorMessage);
1916
protected static Task<UnitResult<E>> Task_Throwing_E() => throw new Exception(ErrorMessage);
2017
protected static Task<Result<T, E>> Task_Throwing_T_E() => throw new Exception(ErrorMessage);
21-
protected static Task<Result<K>> Task_Throwing_K() => throw new Exception(ErrorMessage);
22-
protected static Task<Result<T, K>> Task_Throwing_T_K() => throw new Exception(ErrorMessage);
18+
protected static Task<Result<K>> Task_Throwing_K() => throw new Exception(ErrorMessage);
2319
protected static Task<Result<K, E>> Task_Throwing_K_E() => throw new Exception(ErrorMessage);
2420

25-
protected static ValueTask<Result> ValueTask_Throwing() => throw new Exception(ErrorMessage);
26-
protected static ValueTask<Result<T>> ValueTask_Throwing_T() => throw new Exception(ErrorMessage);
21+
protected static ValueTask<Result> ValueTask_Throwing() => throw new Exception(ErrorMessage);
2722
protected static ValueTask<UnitResult<E>> ValueTask_Throwing_E() => throw new Exception(ErrorMessage);
2823
protected static ValueTask<Result<T, E>> ValueTask_Throwing_T_E() => throw new Exception(ErrorMessage);
29-
protected static ValueTask<Result<K>> ValueTask_Throwing_K() => throw new Exception(ErrorMessage);
30-
protected static ValueTask<Result<T, K>> ValueTask_Throwing_T_K() => throw new Exception(ErrorMessage);
24+
protected static ValueTask<Result<K>> ValueTask_Throwing_K() => throw new Exception(ErrorMessage);
3125
protected static ValueTask<Result<K, E>> ValueTask_Throwing_K_E() => throw new Exception(ErrorMessage);
3226

3327

‎CSharpFunctionalExtensions.Tests/ResultTests/Extensions/BindTryTests.ValueTask.Left.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Threading.Tasks;
1+
using CSharpFunctionalExtensions.ValueTasks;
2+
using System.Threading.Tasks;
23
using Xunit;
34

45
namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions

‎CSharpFunctionalExtensions.Tests/ResultTests/Extensions/BindTryTests.ValueTask.Right.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Threading.Tasks;
1+
using CSharpFunctionalExtensions.ValueTasks;
2+
using System.Threading.Tasks;
23
using Xunit;
34

45
namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions

‎CSharpFunctionalExtensions.Tests/ResultTests/Extensions/BindTryTests.ValueTask.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Threading.Tasks;
1+
using CSharpFunctionalExtensions.ValueTasks;
2+
using System.Threading.Tasks;
23
using Xunit;
34

45
namespace CSharpFunctionalExtensions.Tests.ResultTests.Extensions

‎CSharpFunctionalExtensions/Result/Methods/Extensions/BindTry.Task.Left.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ public static partial class AsyncResultExtensionsLeftOperand
77
{
88
/// <summary>
99
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
10-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
10+
/// If a given function throws an exception, an error is returned from the given error handler
1111
/// </summary>
1212
/// <param name="resultTask">Extended result</param>
13-
/// <param name="func">Function returning result to to bind</param>
13+
/// <param name="func">Function returning result to bind</param>
1414
/// <param name="errorHandler">Error handling function</param>
1515
/// <returns>Binding result</returns>
1616
public static async Task<Result> BindTry(this Task<Result> resultTask, Func<Result> func,
@@ -22,11 +22,11 @@ public static async Task<Result> BindTry(this Task<Result> resultTask, Func<Resu
2222

2323
/// <summary>
2424
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
25-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
25+
/// If a given function throws an exception, an error is returned from the given error handler
2626
/// </summary>
2727
/// <typeparam name="K"><paramref name="func" /> Result Type parameter</typeparam>
2828
/// <param name="resultTask">Extended result</param>
29-
/// <param name="func">Function returning result to to bind</param>
29+
/// <param name="func">Function returning result to bind</param>
3030
/// <param name="errorHandler">Error handling function</param>
3131
/// <returns>Binding result</returns>
3232
public static async Task<Result<K>> BindTry<K>(this Task<Result> resultTask, Func<Result<K>> func,
@@ -38,11 +38,11 @@ public static async Task<Result<K>> BindTry<K>(this Task<Result> resultTask, Fun
3838

3939
/// <summary>
4040
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
41-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
41+
/// If a given function throws an exception, an error is returned from the given error handler
4242
/// </summary>
4343
/// <typeparam name="T">Result Type parameter</typeparam>
4444
/// <param name="resultTask">Extended result</param>
45-
/// <param name="func">Function returning result to to bind</param>
45+
/// <param name="func">Function returning result to bind</param>
4646
/// <param name="errorHandler">Error handling function</param>
4747
/// <returns>Binding result</returns>
4848
public static async Task<Result> BindTry<T>(this Task<Result<T>> resultTask, Func<T, Result> func,
@@ -54,12 +54,12 @@ public static async Task<Result> BindTry<T>(this Task<Result<T>> resultTask, Fun
5454

5555
/// <summary>
5656
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
57-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
57+
/// If a given function throws an exception, an error is returned from the given error handler
5858
/// </summary>
5959
/// <typeparam name="T">Result Type parameter</typeparam>
6060
/// <typeparam name="K"><paramref name="func" /> Result Type parameter</typeparam>
6161
/// <param name="resultTask">Extended result</param>
62-
/// <param name="func">Function returning result to to bind</param>
62+
/// <param name="func">Function returning result to bind</param>
6363
/// <param name="errorHandler">Error handling function</param>
6464
/// <returns>Binding result</returns>
6565
public static async Task<Result<K>> BindTry<T, K>(this Task<Result<T>> resultTask, Func<T, Result<K>> func,
@@ -76,7 +76,7 @@ public static async Task<Result<K>> BindTry<T, K>(this Task<Result<T>> resultTas
7676
/// <typeparam name="T">Result Type parameter</typeparam>
7777
/// <typeparam name="E">Error Type parameter</typeparam>
7878
/// <param name="resultTask">Extended result</param>
79-
/// <param name="func">Function returning result to to bind</param>
79+
/// <param name="func">Function returning result to bind</param>
8080
/// <param name="errorHandler">Error handling function</param>
8181
/// <returns>Binding result</returns>
8282
public static async Task<UnitResult<E>> BindTry<T, E>(this Task<Result<T, E>> resultTask, Func<T, UnitResult<E>> func,
@@ -88,13 +88,13 @@ public static async Task<UnitResult<E>> BindTry<T, E>(this Task<Result<T, E>> re
8888

8989
/// <summary>
9090
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
91-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
91+
/// If a given function throws an exception, an error is returned from the given error handler
9292
/// </summary>
9393
/// <typeparam name="T">Result Type parameter</typeparam>
9494
/// <typeparam name="K"><paramref name="func" /> Result Type parameter</typeparam>
9595
/// <typeparam name="E">Error Type parameter</typeparam>
9696
/// <param name="resultTask">Extended result</param>
97-
/// <param name="func">Function returning result to to bind</param>
97+
/// <param name="func">Function returning result to bind</param>
9898
/// <param name="errorHandler">Error handling function</param>
9999
/// <returns>Binding result</returns>
100100
public static async Task<Result<K, E>> BindTry<T, K, E>(this Task<Result<T, E>> resultTask, Func<T, Result<K, E>> func,
@@ -110,7 +110,7 @@ public static async Task<Result<K, E>> BindTry<T, K, E>(this Task<Result<T, E>>
110110
/// </summary>
111111
/// <typeparam name="E">Error Type parameter</typeparam>
112112
/// <param name="resultTask">Extended result</param>
113-
/// <param name="func">Function returning result to to bind</param>
113+
/// <param name="func">Function returning result to bind</param>
114114
/// <param name="errorHandler">Error handling function</param>
115115
/// <returns>Binding result</returns>
116116
public static async Task<UnitResult<E>> BindTry<E>(this Task<UnitResult<E>> resultTask, Func<UnitResult<E>> func,
@@ -127,7 +127,7 @@ public static async Task<UnitResult<E>> BindTry<E>(this Task<UnitResult<E>> resu
127127
/// <typeparam name="T">Result Type parameter</typeparam>
128128
/// <typeparam name="E">Error Type parameter</typeparam>
129129
/// <param name="resultTask">Extended result</param>
130-
/// <param name="func">Function returning result to to bind</param>
130+
/// <param name="func">Function returning result to bind</param>
131131
/// <param name="errorHandler">Error handling function</param>
132132
/// <returns>Binding result</returns>
133133
public static async Task<Result<T, E>> BindTry<T, E>(this Task<UnitResult<E>> resultTask, Func<Result<T, E>> func,

‎CSharpFunctionalExtensions/Result/Methods/Extensions/BindTry.Task.Right.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ public static partial class AsyncResultExtensionsRightOperand
77
{
88
/// <summary>
99
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
10-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
10+
/// If a given function throws an exception, an error is returned from the given error handler
1111
/// </summary>
1212
/// <typeparam name="T">Result Type parameter</typeparam>
1313
/// <typeparam name="K"><paramref name="func" /> Result Type parameter</typeparam>
1414
/// <typeparam name="E">Error Type parameter</typeparam>
1515
/// <param name="result">Extended result</param>
16-
/// <param name="func">Function returning result to to bind</param>
16+
/// <param name="func">Function returning result to bind</param>
1717
/// <param name="errorHandler">Error handling function</param>
1818
/// <returns>Binding result</returns>
1919
public static async Task<Result<K, E>> BindTry<T, K, E>(this Result<T, E> result, Func<T, Task<Result<K, E>>> func,
@@ -26,12 +26,12 @@ public static async Task<Result<K, E>> BindTry<T, K, E>(this Result<T, E> result
2626

2727
/// <summary>
2828
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
29-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
29+
/// If a given function throws an exception, an error is returned from the given error handler
3030
/// </summary>
3131
/// <typeparam name="T">Result Type parameter</typeparam>
3232
/// <typeparam name="K"><paramref name="func" /> Result Type parameter</typeparam>
3333
/// <param name="result">Extended result</param>
34-
/// <param name="func">Function returning result to to bind</param>
34+
/// <param name="func">Function returning result to bind</param>
3535
/// <param name="errorHandler">Error handling function</param>
3636
/// <returns>Binding result</returns>
3737
public static async Task<Result<K>> BindTry<T, K>(this Result<T> result, Func<T, Task<Result<K>>> func,
@@ -44,11 +44,11 @@ public static async Task<Result<K>> BindTry<T, K>(this Result<T> result, Func<T,
4444

4545
/// <summary>
4646
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
47-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
47+
/// If a given function throws an exception, an error is returned from the given error handler
4848
/// </summary>
4949
/// <typeparam name="K"><paramref name="func" /> Result Type parameter</typeparam>
5050
/// <param name="result">Extended result</param>
51-
/// <param name="func">Function returning result to to bind</param>
51+
/// <param name="func">Function returning result to bind</param>
5252
/// <param name="errorHandler">Error handling function</param>
5353
/// <returns>Binding result</returns>
5454
public static async Task<Result<K>> BindTry<K>(this Result result, Func<Task<Result<K>>> func,
@@ -61,11 +61,11 @@ public static async Task<Result<K>> BindTry<K>(this Result result, Func<Task<Res
6161

6262
/// <summary>
6363
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
64-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
64+
/// If a given function throws an exception, an error is returned from the given error handler
6565
/// </summary>
6666
/// <typeparam name="T">Result Type parameter</typeparam>
6767
/// <param name="result">Extended result</param>
68-
/// <param name="func">Function returning result to to bind</param>
68+
/// <param name="func">Function returning result to bind</param>
6969
/// <param name="errorHandler">Error handling function</param>
7070
/// <returns>Binding result</returns>
7171
public static async Task<Result> BindTry<T>(this Result<T> result, Func<T, Task<Result>> func,
@@ -78,10 +78,10 @@ public static async Task<Result> BindTry<T>(this Result<T> result, Func<T, Task<
7878

7979
/// <summary>
8080
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
81-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
81+
/// If a given function throws an exception, an error is returned from the given error handler
8282
/// </summary>
8383
/// <param name="result">Extended result</param>
84-
/// <param name="func">Function returning result to to bind</param>
84+
/// <param name="func">Function returning result to bind</param>
8585
/// <param name="errorHandler">Error handling function</param>
8686
/// <returns>Binding result</returns>
8787
public static async Task<Result> BindTry(this Result result, Func<Task<Result>> func,
@@ -94,11 +94,11 @@ public static async Task<Result> BindTry(this Result result, Func<Task<Result>>
9494

9595
/// <summary>
9696
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
97-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
97+
/// If a given function throws an exception, an error is returned from the given error handler
9898
/// </summary>
9999
/// <typeparam name="E">Error Type parameter</typeparam>
100100
/// <param name="result">Extended result</param>
101-
/// <param name="func">Function returning result to to bind</param>
101+
/// <param name="func">Function returning result to bind</param>
102102
/// <param name="errorHandler">Error handling function</param>
103103
/// <returns>Binding result</returns>
104104
public static async Task<UnitResult<E>> BindTry<E>(this UnitResult<E> result, Func<Task<UnitResult<E>>> func,
@@ -111,12 +111,12 @@ public static async Task<UnitResult<E>> BindTry<E>(this UnitResult<E> result, Fu
111111

112112
/// <summary>
113113
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
114-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
114+
/// If a given function throws an exception, an error is returned from the given error handler
115115
/// </summary>
116116
/// <typeparam name="T">Result Type parameter</typeparam>
117117
/// <typeparam name="E">Error Type parameter</typeparam>
118118
/// <param name="result">Extended result</param>
119-
/// <param name="func">Function returning result to to bind</param>
119+
/// <param name="func">Function returning result to bind</param>
120120
/// <param name="errorHandler">Error handling function</param>
121121
/// <returns>Binding result</returns>
122122
public static async Task<Result<T, E>> BindTry<T, E>(this UnitResult<E> result, Func<Task<Result<T, E>>> func,
@@ -129,12 +129,12 @@ public static async Task<Result<T, E>> BindTry<T, E>(this UnitResult<E> result,
129129

130130
/// <summary>
131131
/// Selects result from the return value of a given function. If the calling Result is a failure, a new failure result is returned instead.
132-
/// If a given function throws an exception, an error is returned from the given (or default) error handler
132+
/// If a given function throws an exception, an error is returned from the given error handler
133133
/// </summary>
134134
/// <typeparam name="T">Result Type parameter</typeparam>
135135
/// <typeparam name="E">Error Type parameter</typeparam>
136136
/// <param name="result">Extended result</param>
137-
/// <param name="func">Function returning result to to bind</param>
137+
/// <param name="func">Function returning result to bind</param>
138138
/// <param name="errorHandler">Error handling function</param>
139139
/// <returns>Binding result</returns>
140140
public static async Task<UnitResult<E>> BindTry<T, E>(this Result<T, E> result, Func<T, Task<UnitResult<E>>> func,

0 commit comments

Comments
 (0)