refactor: remove throw helpers (#80)

oliverbooth · Apr 13, 2023 · bb3659c · bb3659c
1 parent 3b5fb7b
commit bb3659c
Show file tree

Hide file tree

Showing 50 changed files with 3 additions and 979 deletions.
diff --git a/X10D/src/Collections/ArrayExtensions.cs b/X10D/src/Collections/ArrayExtensions.cs
@@ -17,14 +17,10 @@ public static class ArrayExtensions
     [Pure]
     public static IReadOnlyCollection<T> AsReadOnly<T>(this T[] array)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(array);
-#else
         if (array is null)
         {
             throw new ArgumentNullException(nameof(array));
         }
-#endif
 
         return Array.AsReadOnly(array);
     }
@@ -49,14 +45,10 @@ public static void Clear<T>(this T?[] array)
     /// <exception cref="ArgumentNullException"><paramref name="array" /> is <see langword="null" />.</exception>
     public static void Clear<T>(this T?[] array, Range range)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(array);
-#else
         if (array is null)
         {
             throw new ArgumentNullException(nameof(array));
         }
-#endif
 
         (int offset, int length) = range.GetOffsetAndLength(array.Length);
         array.Clear(offset, length);
@@ -79,14 +71,10 @@ public static void Clear<T>(this T?[] array, Range range)
     /// </exception>
     public static void Clear<T>(this T?[] array, int index, int length)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(array);
-#else
         if (array is null)
         {
             throw new ArgumentNullException(nameof(array));
         }
-#endif
 
         if (length == 0 || array.Length == 0)
         {

diff --git a/X10D/src/Collections/BoolListExtensions.cs b/X10D/src/Collections/BoolListExtensions.cs
@@ -18,14 +18,10 @@ public static class BoolListExtensions
     [Pure]
     public static byte PackByte(this IReadOnlyList<bool> source)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         if (source.Count > 8)
         {
@@ -52,14 +48,10 @@ public static byte PackByte(this IReadOnlyList<bool> source)
     [Pure]
     public static short PackInt16(this IReadOnlyList<bool> source)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         if (source.Count > 16)
         {
@@ -86,14 +78,10 @@ public static short PackInt16(this IReadOnlyList<bool> source)
     [Pure]
     public static int PackInt32(this IReadOnlyList<bool> source)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         if (source.Count > 32)
         {
@@ -120,14 +108,10 @@ public static int PackInt32(this IReadOnlyList<bool> source)
     [Pure]
     public static long PackInt64(this IReadOnlyList<bool> source)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         if (source.Count > 64)
         {

diff --git a/X10D/src/Collections/CollectionExtensions.cs b/X10D/src/Collections/CollectionExtensions.cs
@@ -16,14 +16,10 @@ public static class CollectionExtensions
     /// <seealso cref="EnumerableExtensions.DisposeAll{T}" />
     public static void ClearAndDisposeAll<T>(this ICollection<T> source) where T : IDisposable
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         if (source.IsReadOnly)
         {
@@ -55,14 +51,10 @@ public static void ClearAndDisposeAll<T>(this ICollection<T> source) where T : I
     /// <seealso cref="EnumerableExtensions.DisposeAllAsync{T}" />
     public static async Task ClearAndDisposeAllAsync<T>(this ICollection<T> source) where T : IAsyncDisposable
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         if (source.IsReadOnly)
         {

diff --git a/X10D/src/Collections/DictionaryExtensions.cs b/X10D/src/Collections/DictionaryExtensions.cs
@@ -37,10 +37,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this Dictionary<TKey, TValue> dic
         Func<TKey, TValue, TValue> updateValueFactory)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(dictionary);
-        ArgumentNullException.ThrowIfNull(updateValueFactory);
-#else
         if (dictionary is null)
         {
             throw new ArgumentNullException(nameof(dictionary));
@@ -50,7 +46,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this Dictionary<TKey, TValue> dic
         {
             throw new ArgumentNullException(nameof(updateValueFactory));
         }
-#endif
 
 #if NET6_0_OR_GREATER
         ref var value = ref CollectionsMarshal.GetValueRefOrAddDefault(dictionary, key, out bool exists);
@@ -97,10 +92,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> di
         Func<TKey, TValue, TValue> updateValueFactory)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(dictionary);
-        ArgumentNullException.ThrowIfNull(updateValueFactory);
-#else
         if (dictionary is null)
         {
             throw new ArgumentNullException(nameof(dictionary));
@@ -110,7 +101,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> di
         {
             throw new ArgumentNullException(nameof(updateValueFactory));
         }
-#endif
 
         if (dictionary.TryGetValue(key, out TValue? old))
         {
@@ -152,11 +142,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this Dictionary<TKey, TValue> dic
         Func<TKey, TValue> addValueFactory, Func<TKey, TValue, TValue> updateValueFactory)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(dictionary);
-        ArgumentNullException.ThrowIfNull(addValueFactory);
-        ArgumentNullException.ThrowIfNull(updateValueFactory);
-#else
         if (dictionary is null)
         {
             throw new ArgumentNullException(nameof(dictionary));
@@ -171,7 +156,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this Dictionary<TKey, TValue> dic
         {
             throw new ArgumentNullException(nameof(updateValueFactory));
         }
-#endif
 
 #if NET6_0_OR_GREATER
         ref TValue? value = ref CollectionsMarshal.GetValueRefOrAddDefault(dictionary, key, out bool exists);
@@ -222,11 +206,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> di
         Func<TKey, TValue> addValueFactory, Func<TKey, TValue, TValue> updateValueFactory)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(dictionary);
-        ArgumentNullException.ThrowIfNull(addValueFactory);
-        ArgumentNullException.ThrowIfNull(updateValueFactory);
-#else
         if (dictionary is null)
         {
             throw new ArgumentNullException(nameof(dictionary));
@@ -241,7 +220,6 @@ public static TValue AddOrUpdate<TKey, TValue>(this IDictionary<TKey, TValue> di
         {
             throw new ArgumentNullException(nameof(updateValueFactory));
         }
-#endif
 
         if (dictionary.TryGetValue(key, out TValue? old))
         {
@@ -291,11 +269,6 @@ public static TValue AddOrUpdate<TKey, TValue, TArg>(this Dictionary<TKey, TValu
         Func<TKey, TArg, TValue> addValueFactory, Func<TKey, TValue, TArg, TValue> updateValueFactory, TArg factoryArgument)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(dictionary);
-        ArgumentNullException.ThrowIfNull(addValueFactory);
-        ArgumentNullException.ThrowIfNull(updateValueFactory);
-#else
         if (dictionary is null)
         {
             throw new ArgumentNullException(nameof(dictionary));
@@ -310,7 +283,6 @@ public static TValue AddOrUpdate<TKey, TValue, TArg>(this Dictionary<TKey, TValu
         {
             throw new ArgumentNullException(nameof(updateValueFactory));
         }
-#endif
 
 #if NET6_0_OR_GREATER
         ref TValue? value = ref CollectionsMarshal.GetValueRefOrAddDefault(dictionary, key, out bool exists);
@@ -367,11 +339,6 @@ public static TValue AddOrUpdate<TKey, TValue, TArg>(this IDictionary<TKey, TVal
         Func<TKey, TArg, TValue> addValueFactory, Func<TKey, TValue, TArg, TValue> updateValueFactory, TArg factoryArgument)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(dictionary);
-        ArgumentNullException.ThrowIfNull(addValueFactory);
-        ArgumentNullException.ThrowIfNull(updateValueFactory);
-#else
         if (dictionary is null)
         {
             throw new ArgumentNullException(nameof(dictionary));
@@ -386,7 +353,6 @@ public static TValue AddOrUpdate<TKey, TValue, TArg>(this IDictionary<TKey, TVal
         {
             throw new ArgumentNullException(nameof(updateValueFactory));
         }
-#endif
 
         if (dictionary.TryGetValue(key, out TValue? old))
         {
@@ -414,14 +380,10 @@ public static TValue AddOrUpdate<TKey, TValue, TArg>(this IDictionary<TKey, TVal
     [Pure]
     public static string ToConnectionString<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         static string SanitizeValue(string? value)
         {
@@ -461,10 +423,6 @@ static string GetQueryParameter(KeyValuePair<TKey, TValue> pair)
     public static string ToConnectionString<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source,
         Func<TValue, string?> selector)
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-        ArgumentNullException.ThrowIfNull(selector);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
@@ -474,7 +432,6 @@ public static string ToConnectionString<TKey, TValue>(this IEnumerable<KeyValueP
         {
             throw new ArgumentNullException(nameof(selector));
         }
-#endif
 
         static string SanitizeValue(string? value)
         {
@@ -520,11 +477,6 @@ public static string ToConnectionString<TKey, TValue>(this IEnumerable<KeyValueP
         Func<TKey, string> keySelector, Func<TValue, string?> valueSelector)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-        ArgumentNullException.ThrowIfNull(keySelector);
-        ArgumentNullException.ThrowIfNull(valueSelector);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
@@ -539,7 +491,6 @@ public static string ToConnectionString<TKey, TValue>(this IEnumerable<KeyValueP
         {
             throw new ArgumentNullException(nameof(valueSelector));
         }
-#endif
 
         static string SanitizeValue(string? value)
         {
@@ -571,14 +522,10 @@ string GetQueryParameter(KeyValuePair<TKey, TValue> pair)
     public static string ToGetParameters<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
         }
-#endif
 
         static string GetQueryParameter(KeyValuePair<TKey, TValue> pair)
         {
@@ -610,10 +557,6 @@ public static string ToGetParameters<TKey, TValue>(this IEnumerable<KeyValuePair
         Func<TValue, string?> selector)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-        ArgumentNullException.ThrowIfNull(selector);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
@@ -623,7 +566,6 @@ public static string ToGetParameters<TKey, TValue>(this IEnumerable<KeyValuePair
         {
             throw new ArgumentNullException(nameof(selector));
         }
-#endif
 
         // can't static here because of 'selector' parameter
         string GetQueryParameter(KeyValuePair<TKey, TValue> pair)
@@ -661,11 +603,6 @@ public static string ToGetParameters<TKey, TValue>(this IEnumerable<KeyValuePair
         Func<TKey, string> keySelector, Func<TValue, string?> valueSelector)
         where TKey : notnull
     {
-#if NET6_0_OR_GREATER
-        ArgumentNullException.ThrowIfNull(source);
-        ArgumentNullException.ThrowIfNull(keySelector);
-        ArgumentNullException.ThrowIfNull(valueSelector);
-#else
         if (source is null)
         {
             throw new ArgumentNullException(nameof(source));
@@ -680,7 +617,6 @@ public static string ToGetParameters<TKey, TValue>(this IEnumerable<KeyValuePair
         {
             throw new ArgumentNullException(nameof(valueSelector));
         }
-#endif
 
         // can't static here because of selector parameters
         string GetQueryParameter(KeyValuePair<TKey, TValue> pair)