diff options
| author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-12-21 03:43:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 03:43:10 +0100 |
| commit | 9d1cbab1c432b6f1d66ec939445bec68b6af519e (patch) | |
| tree | edb1666225f7a7b51b534f4bd6090dc592680597 | |
| parent | 3a8524dd923e9d9a79e4979a47fd427388ea7010 (diff) | |
| parent | abd7927325828477fe99dd83ab886f59c031de96 (diff) | |
| download | redot-engine-9d1cbab1c432b6f1d66ec939445bec68b6af519e.tar.gz | |
Merge pull request #86373 from raulsntos/dotnet/fix-nameof
C#: Use string literal instead of nameof
5 files changed, 5 insertions, 5 deletions
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs index 6024073f8a..c7420dcf7e 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs @@ -1142,7 +1142,7 @@ namespace Godot.Collections /// </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 index 405f280cbb..d08fad90db 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs @@ -561,7 +561,7 @@ namespace Godot.Collections /// </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 index 537d863ef2..04b6c2e743 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/ExceptionUtils.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/ExceptionUtils.cs @@ -241,7 +241,7 @@ namespace Godot.NativeInterop 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 index 2ab6904417..0af640533d 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs @@ -138,7 +138,7 @@ namespace Godot /// 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 index 51e97e0fb8..21d9ada127 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs @@ -84,7 +84,7 @@ namespace Godot /// 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> |