godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C#: Use string literal instead of nameof 

Using `nameof` expressions with method parameters requires C# 11 and we're currently on C# 10.
This commit is contained in:
Raul Santos 2023-12-21 03:11:47 +01:00
parent 3a8524dd92
commit abd7927325
No known key found for this signature in database
GPG Key ID: B532473AE3A803E4
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
View File

@ -1142,7 +1142,7 @@ namespace Godot.Collections
/// </summary> /// </summary>
/// <param name="from">The typed array to convert.</param> /// <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> /// <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) public static explicit operator Array?(Array<T>? from)
{ {
return from?._underlyingArray; return from?._underlyingArray;

2
modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
View File

@ -561,7 +561,7 @@ namespace Godot.Collections
/// </summary> /// </summary>
/// <param name="from">The typed dictionary to convert.</param> /// <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> /// <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) public static explicit operator Dictionary?(Dictionary<TKey, TValue>? from)
{ {
return from?._underlyingDict; return from?._underlyingDict;

2
modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/ExceptionUtils.cs
View File

@ -241,7 +241,7 @@ namespace Godot.NativeInterop
return variant->Type.ToString(); 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) if (ptr == IntPtr.Zero)
{ {

2
modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs
View File

@ -138,7 +138,7 @@ namespace Godot
/// Converts this <see cref="NodePath"/> to a string. /// Converts this <see cref="NodePath"/> to a string.
/// </summary> /// </summary>
/// <param name="from">The <see cref="NodePath"/> to convert.</param> /// <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(); public static implicit operator string?(NodePath? from) => from?.ToString();
/// <summary> /// <summary>

2
modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs
View File

@ -84,7 +84,7 @@ namespace Godot
/// Converts a <see cref="StringName"/> to a string. /// Converts a <see cref="StringName"/> to a string.
/// </summary> /// </summary>
/// <param name="from">The <see cref="StringName"/> to convert.</param> /// <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(); public static implicit operator string?(StringName? from) => from?.ToString();
/// <summary> /// <summary>