Merge pull request #86373 from raulsntos/dotnet/fix-nameof

C#: Use string literal instead of nameof
godotengine · Dec 21, 2023 · 9d1cbab · 9d1cbab
2 parents 3a8524d + abd7927
commit 9d1cbab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
@@ -1142,7 +1142,7 @@ internal static Array<T> CreateTakingOwnershipOfDisposableValue(godot_array nati
         /// </summary>
         /// <param name="from">The typed array to convert.</param>
         /// <returns>A new Godot Array, or <see langword="null"/> if <see paramref="from"/> was null.</returns>
-        [return: NotNullIfNotNull(nameof(from))]
+        [return: NotNullIfNotNull("from")]
         public static explicit operator Array?(Array<T>? from)
         {
             return from?._underlyingArray;

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
@@ -561,7 +561,7 @@ internal static Dictionary<TKey, TValue> CreateTakingOwnershipOfDisposableValue(
         /// </summary>
         /// <param name="from">The typed dictionary to convert.</param>
         /// <returns>A new Godot Dictionary, or <see langword="null"/> if <see paramref="from"/> was null.</returns>
-        [return: NotNullIfNotNull(nameof(from))]
+        [return: NotNullIfNotNull("from")]
         public static explicit operator Dictionary?(Dictionary<TKey, TValue>? from)
         {
             return from?._underlyingDict;

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/ExceptionUtils.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/ExceptionUtils.cs
@@ -241,7 +241,7 @@ private unsafe static string GetVariantTypeName(godot_variant* variant)
             return variant->Type.ToString();
         }
 
-        internal static void ThrowIfNullPtr(IntPtr ptr, [CallerArgumentExpression(nameof(ptr))] string? paramName = null)
+        internal static void ThrowIfNullPtr(IntPtr ptr, [CallerArgumentExpression("ptr")] string? paramName = null)
         {
             if (ptr == IntPtr.Zero)
             {

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs
@@ -138,7 +138,7 @@ public NodePath(string path)
         /// Converts this <see cref="NodePath"/> to a string.
         /// </summary>
         /// <param name="from">The <see cref="NodePath"/> to convert.</param>
-        [return: NotNullIfNotNull(nameof(from))]
+        [return: NotNullIfNotNull("from")]
         public static implicit operator string?(NodePath? from) => from?.ToString();
 
         /// <summary>

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs
@@ -84,7 +84,7 @@ public StringName(string name)
         /// Converts a <see cref="StringName"/> to a string.
         /// </summary>
         /// <param name="from">The <see cref="StringName"/> to convert.</param>
-        [return: NotNullIfNotNull(nameof(from))]
+        [return: NotNullIfNotNull("from")]
         public static implicit operator string?(StringName? from) => from?.ToString();
 
         /// <summary>