use ArgumentResult instead of SymbolResult in TryConvertArgument

Author: jonsequitur

src/System.CommandLine.Tests/Binding/TypeConversionTests.cs

@@ -18,7 +18,7 @@ public class TypeConversionTests
         [Fact]
         public void Custom_types_and_conversion_logic_can_be_specified()
         {
-            var argument = new Argument<MyCustomType>((SymbolResult parsed, out MyCustomType value) =>
+            var argument = new Argument<MyCustomType>((ArgumentResult parsed, out MyCustomType value) =>
             {
                 var custom = new MyCustomType();
                 foreach (var a in parsed.Tokens)
@@ -261,7 +261,7 @@ public void When_argument_cannot_be_parsed_as_the_specified_type_then_getting_va
             {
                 new Option(new[] { "-o", "--one" })
                 {
-                    Argument = new Argument<int>((SymbolResult symbol, out int value) =>
+                    Argument = new Argument<int>((ArgumentResult symbol, out int value) =>
                     {
                         if (int.TryParse(symbol.Tokens.Select(t => t.Value).Single(), out value))
                         {
@@ -674,7 +674,7 @@ public void When_custom_converter_is_specified_and_an_argument_is_of_the_wrong_t
         {
             var command = new Command("tally")
             {
-                new Argument<int>((SymbolResult symbolResult, out int value) =>
+                new Argument<int>((ArgumentResult symbolResult, out int value) =>
                 {
                     value = default;
                     symbolResult.ErrorMessage = "Could not parse int";
@@ -698,7 +698,7 @@ public void When_custom_conversion_fails_then_an_option_does_not_accept_further_
                 new Argument<string>(),
                 new Option("-x")
                 {
-                    Argument = new Argument<string>((SymbolResult symbolResult, out string value) =>
+                    Argument = new Argument<string>((ArgumentResult symbolResult, out string value) =>
                     {
                         value = null;
                         return false;

src/System.CommandLine/Argument.cs

@@ -64,7 +64,7 @@ internal TryConvertArgument ConvertArguments
                         if (Arity.MaximumNumberOfValues == 1 &&
                             ArgumentType == typeof(bool))
                         {
-                            _convertArguments = (SymbolResult symbol, out object value) =>
+                            _convertArguments = (ArgumentResult symbol, out object value) =>
                             {
                                 value = ArgumentConverter.ConvertObject(
                                     this,

src/System.CommandLine/Argument{T}.cs

@@ -45,7 +45,7 @@ public Argument(TryConvertArgument<T> convert, Func<T> getDefaultValue = default
                 throw new ArgumentNullException(nameof(convert));
             }
 
-            ConvertArguments = (SymbolResult result, out object value) =>
+            ConvertArguments = (ArgumentResult result, out object value) =>
             {
                 if (convert(result, out var valueObj))
                 {

src/System.CommandLine/Binding/TryConvertArgument.cs

@@ -5,7 +5,11 @@
 
 namespace System.CommandLine.Binding
 {
-    public delegate bool TryConvertArgument(SymbolResult symbolResult, out object value);
+    public delegate bool TryConvertArgument(
+        ArgumentResult symbolResult,
+        out object value);
 
-    public delegate bool TryConvertArgument<T>(SymbolResult symbolResult, out T value);
-}
+    public delegate bool TryConvertArgument<T>(
+        ArgumentResult symbolResult,
+        out T value);
+}