Fixed RedundantArgumentMatcherException

Author: icalvo

src/NSubstitute/Arg.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Linq.Expressions;
+using NSubstitute.Core;
 using NSubstitute.Core.Arguments;
+using NSubstitute.Exceptions;
 
 // Disable nullability for client API, so it does not affect clients.
 #nullable disable annotations
@@ -94,7 +96,12 @@ public static ref TDelegate InvokeDelegate<TDelegate>(params object[] arguments)
         /// </summary>
         public static ref T Do<T>(Action<T> useArgument)
         {
-            if (typeof(T) == typeof(AnyType)) throw new ArgumentException("Use DoForAny() instead of Do<AnyType>()");
+            if (typeof(T) == typeof(AnyType))
+            {
+                SubstitutionContext.Current.ThreadContext.DequeueAllArgumentSpecifications();
+                throw new DoAnyTypeException();
+            }
+
             return ref ArgumentMatcher.Enqueue<T>(new AnyArgumentMatcher(typeof(T)), x => useArgument((T) x!));
         }
 

src/NSubstitute/Exceptions/DoAnyTypeException.cs

@@ -0,0 +1,7 @@
+namespace NSubstitute.Exceptions;
+
+public class DoAnyTypeException : SubstituteException
+{
+    private const string FixedMessage = "Use DoForAny() instead of Do<AnyType>()";
+    public DoAnyTypeException() : base(FixedMessage) { }
+}

tests/NSubstitute.Acceptance.Specs/GenericArguments.cs

@@ -1,4 +1,4 @@
-using System;
+using NSubstitute.Exceptions;
 using NUnit.Framework;
 
 namespace NSubstitute.Acceptance.Specs;
@@ -40,11 +40,9 @@ public void Return_result_for_any_argument()
     [Test]
     public void Throw_with_Do_AnyType()
     {
-        string argDoResult = null;
-
         ISomethingWithGenerics something = Substitute.For<ISomethingWithGenerics>();
 
-        Assert.Throws<ArgumentException>(() =>
-            something.Log(Arg.Any<int>(), Arg.Do<Arg.AnyType>(a => argDoResult = a.ToString())));
+        Assert.Throws<DoAnyTypeException>(() =>
+            something.Log(Arg.Any<int>(), Arg.Do<Arg.AnyType>(a => _ = a.ToString())));
     }
 }