Fix typo in ReadValue args (#209)

* Fix typo in ReadValue args * Unused usings
serdedotnet · Dec 17, 2024 · ccf467b · ccf467b
1 parent 2687be2
commit ccf467b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/src/serde/IDeserialize.cs b/src/serde/IDeserialize.cs
@@ -1,12 +1,6 @@
 
 using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
 
 namespace Serde;
 
@@ -97,8 +91,8 @@ public interface IDeserializeCollection
 {
     int? SizeOpt { get; }
 
-    bool TryReadValue<T, TProxy>(ISerdeInfo typeInfo, TProxy deserialize, [MaybeNullWhen(false)] out T next)
-        where TProxy : IDeserialize<T>;
+    bool TryReadValue<T, D>(ISerdeInfo typeInfo, D deserialize, [MaybeNullWhen(false)] out T next)
+        where D : IDeserialize<T>;
 }
 
 public interface IDeserializeType
@@ -116,7 +110,7 @@ public interface IDeserializeType
     /// </summary>
     int TryReadIndex(ISerdeInfo map, out string? errorName);
 
-    T ReadValue<T>(int index, IDeserialize<T> deserialize);
+    T ReadValue<T, D>(int index, D deserialize) where D : IDeserialize<T>;
 
     void SkipValue();
 
@@ -141,7 +135,7 @@ public static class IDeserializeTypeExt
     public static T ReadValue<T, TProvider>(this IDeserializeType deserializeType, int index)
         where TProvider : IDeserializeProvider<T>
     {
-        return deserializeType.ReadValue(index, TProvider.DeserializeInstance);
+        return deserializeType.ReadValue<T, IDeserialize<T>>(index, TProvider.DeserializeInstance);
     }
 }
 
@@ -157,9 +151,9 @@ public interface IDeserializer : IDisposable
     T ReadAny<T>(IDeserializeVisitor<T> v)
         where T : class;
 
-    T? ReadNullableRef<T, TProxy>(TProxy proxy)
+    T? ReadNullableRef<T, D>(D deserialize)
         where T : class
-        where TProxy : IDeserialize<T>;
+        where D : IDeserialize<T>;
 
     bool ReadBool();
     char ReadChar();

diff --git a/src/serde/json/JsonDeserializer.cs b/src/serde/json/JsonDeserializer.cs
@@ -147,7 +147,7 @@ void IDisposable.Dispose()
 
 partial class JsonDeserializer<TReader> : IDeserializeType
 {
-    T IDeserializeType.ReadValue<T>(int index, IDeserialize<T> d)
+    T IDeserializeType.ReadValue<T, D>(int index, D d)
     {
         ReadColon();
         return d.Deserialize(this);

diff --git a/...Test/test_output/WrapperTests.ExplicitInvalidGenericWrapper/FinalDiagnostics.verified.txt b/...Test/test_output/WrapperTests.ExplicitInvalidGenericWrapper/FinalDiagnostics.verified.txt
@@ -1,13 +1,13 @@
 [
   {
-    "Id": "CS0311",
+    "Id": "CS7036",
     "Title": "",
     "Severity": "Error",
     "WarningLevel": "0",
     "Location": "SerdeGenerator/Serde.SerdeImplRoslynGenerator/Container.IDeserialize.cs: (23,52)-(23,79)",
-    "HelpLink": "https://msdn.microsoft.com/query/roslyn.query?appId=roslyn&k=k(CS0311)",
-    "MessageFormat": "The type '{3}' cannot be used as type parameter '{2}' in the generic type or method '{0}'. There is no implicit reference conversion from '{3}' to '{1}'.",
-    "Message": "The type 'Proxy' cannot be used as type parameter 'TProvider' in the generic type or method 'IDeserializeTypeExt.ReadValue<T, TProvider>(IDeserializeType, int)'. There is no implicit reference conversion from 'Proxy' to 'Serde.IDeserializeProvider<Original?>'.",
+    "HelpLink": "https://msdn.microsoft.com/query/roslyn.query?appId=roslyn&k=k(CS7036)",
+    "MessageFormat": "There is no argument given that corresponds to the required parameter '{0}' of '{1}'",
+    "Message": "There is no argument given that corresponds to the required parameter 'deserialize' of 'IDeserializeType.ReadValue<T, D>(int, D)'",
     "Category": "Compiler"
   }
 ]