Cleanup

apfohl · Jan 4, 2024 · d953063 · d953063
1 parent 43ebf1d
commit d953063
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/HotwiredBooks/Extensions/FunctionalExtensions.cs b/HotwiredBooks/Extensions/FunctionalExtensions.cs
@@ -13,15 +13,15 @@ public static ErrorOr<StringValues> JustGetValue(this IFormCollection collection
             ? ErrorOrFactory.From(value)
             : ErrorOr<StringValues>.From([Error.NotFound()]);
 
-    public static T OrElse<T>(this ErrorOr<T> maybe, T orElse) =>
-        maybe.Match(value => value, _ => orElse);
+    public static T OrElse<T>(this ErrorOr<T> errorOr, T orElse) =>
+        errorOr.Match(value => value, _ => orElse);
 
-    public static T OrElse<T>(this ErrorOr<T> maybe, Func<T> orElse) =>
-        maybe.Match(value => value, _ => orElse());
+    public static T OrElse<T>(this ErrorOr<T> errorOr, Func<T> orElse) =>
+        errorOr.Match(value => value, _ => orElse());
 
-    public static async Task<T> OrElse<T>(this Task<ErrorOr<T>> maybe, Func<T> orElse) =>
-        (await maybe).Match(value => value, _ => orElse());
+    public static async Task<T> OrElse<T>(this Task<ErrorOr<T>> errorOr, Func<T> orElse) =>
+        (await errorOr).Match(value => value, _ => orElse());
 
-    public static async Task<T> OrElse<T>(this Task<ErrorOr<T>> maybe, T orElse) =>
-        (await maybe).Match(value => value, _ => orElse);
+    public static async Task<T> OrElse<T>(this Task<ErrorOr<T>> errorOr, T orElse) =>
+        (await errorOr).Match(value => value, _ => orElse);
 }
diff --git a/HotwiredBooksTests/HtmlHelperExtensionsTests.cs b/HotwiredBooksTests/HtmlHelperExtensionsTests.cs
@@ -15,12 +15,12 @@ private static IEnumerable<object[]> DomIdTestCases
     {
         get
         {
-            yield return new object[] { typeof(BookWithId), null, "new_book_with_id" };
-            yield return new object[] { new BookWithId(Id), null, $"book_with_id_{Id}" };
-            yield return new object[] { new BookWithoutId(), null, "new_book_without_id" };
-            yield return new object[] { typeof(BookWithId), "header", "header_book_with_id" };
-            yield return new object[] { new BookWithId(Id), "header", $"header_book_with_id_{Id}" };
-            yield return new object[] { new BookWithoutId(), "header", "header_book_without_id" };
+            yield return [typeof(BookWithId), null, "new_book_with_id"];
+            yield return [new BookWithId(Id), null, $"book_with_id_{Id}"];
+            yield return [new BookWithoutId(), null, "new_book_without_id"];
+            yield return [typeof(BookWithId), "header", "header_book_with_id"];
+            yield return [new BookWithId(Id), "header", $"header_book_with_id_{Id}"];
+            yield return [new BookWithoutId(), "header", "header_book_without_id"];
         }
     }
 
@@ -36,12 +36,12 @@ private static IEnumerable<object[]> DomClassTestCases
     {
         get
         {
-            yield return new object[] { typeof(BookWithId), null, "book_with_id" };
-            yield return new object[] { new BookWithId(Id), null, "book_with_id" };
-            yield return new object[] { new BookWithoutId(), null, "book_without_id" };
-            yield return new object[] { typeof(BookWithId), "header", "header_book_with_id" };
-            yield return new object[] { new BookWithId(Id), "header", "header_book_with_id" };
-            yield return new object[] { new BookWithoutId(), "header", "header_book_without_id" };
+            yield return [typeof(BookWithId), null, "book_with_id"];
+            yield return [new BookWithId(Id), null, "book_with_id"];
+            yield return [new BookWithoutId(), null, "book_without_id"];
+            yield return [typeof(BookWithId), "header", "header_book_with_id"];
+            yield return [new BookWithId(Id), "header", "header_book_with_id"];
+            yield return [new BookWithoutId(), "header", "header_book_without_id"];
         }
     }