ArgumentException.ThrowIfNullOrEmpty

SimonCropp · Nov 13, 2024 · 2093095 · 2093095
1 parent 148c7ba
commit 2093095
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/api_list.include.md b/api_list.include.md
@@ -24,7 +24,7 @@
 
 #### ConcurrentBag<T>
 
- * `void Clear<T>(ConcurrentBag<T>)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.collections.concurrent.concurrentbag-1.clear)
+ * `void Clear<T>()` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.collections.concurrent.concurrentbag-1.clear)
 
 
 #### ConcurrentDictionary<TKey, TValue>

diff --git a/readme.md b/readme.md
@@ -330,9 +330,9 @@ using System.Diagnostics.CodeAnalysis;
 
 struct UnscopedRefUsage
 {
-    int field;
+    int field1;
 
-    [UnscopedRef] ref int Prop1 => ref field;
+    [UnscopedRef] ref int Prop1 => ref field1;
 }
 ```
 <sup><a href='/src/Consume/UnscopedRefUsage.cs#L1-L9' title='Snippet source file'>snippet source</a> | <a href='#snippet-UnscopedRefUsage.cs' title='Start of snippet'>anchor</a></sup>

diff --git a/src/Polyfill/Guard_NotEmpty.cs b/src/Polyfill/Guard_NotEmpty.cs
@@ -19,14 +19,15 @@ static partial class Guard
 {
     public static void NotEmpty(string? value, [CallerArgumentExpression("value")] string argumentName = "")
     {
-#if NET7_0_OR_GREATER
-        ArgumentException.ThrowIfNullOrEmpty(value, argumentName);
-#else
         if (value is null)
         {
             return;
         }
 
+#if NET7_0_OR_GREATER
+        ArgumentException.ThrowIfNullOrEmpty(value, argumentName);
+#else
+
         if (value.Length == 0)
         {
             throw new ArgumentException("Argument cannot be empty.", argumentName);

diff --git a/src/Polyfill/Guard_NotNullOrEmpty.cs b/src/Polyfill/Guard_NotNullOrEmpty.cs
@@ -19,6 +19,10 @@ public static string NotNullOrEmpty(
         [NotNull] string? value,
         [CallerArgumentExpression("value")] string argumentName = "")
     {
+#if NET7_0_OR_GREATER
+        ArgumentException.ThrowIfNullOrEmpty(value, argumentName);
+        return value;
+#else
         if (value is null)
         {
             throw new ArgumentNullException(argumentName);
@@ -30,6 +34,7 @@ public static string NotNullOrEmpty(
         }
 
         return value;
+#endif
     }
 
     public static T NotNullOrEmpty<T>(

diff --git a/src/Polyfill/Guard_NotWhiteSpace.cs b/src/Polyfill/Guard_NotWhiteSpace.cs
@@ -24,7 +24,6 @@ public static void NotWhiteSpace(
         }
 #if NET8_0_OR_GREATER
         ArgumentException.ThrowIfNullOrWhiteSpace(value, argumentName);
-        return value;
 #else
 
         if (value.Length == 0)