From fc20d9b925b83532a19467293a7cdcbaa4ef3d6b Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Wed, 28 Jun 2023 18:41:38 +0200 Subject: [Ryujinx.Common] Address dotnet-format issues (#5358) * dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2211 warnings * Silence CA1806 and CA1834 issues * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Replace MmeShadowScratch with Array256 * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Second dotnet format pass * Fix build issues * Fix StructArrayHelpers.cs * Apply suggestions from code review Co-authored-by: Ac_K * Fix return statements * Fix naming rule violations * Update src/Ryujinx.Common/Utilities/StreamUtils.cs Co-authored-by: Ac_K * Add trailing commas * Address review feedback * Address review feedback * Rename remaining type parameters to TKey and TValue * Fix manual formatting for logging levels * Fix spacing before comments --------- Co-authored-by: Ac_K --- src/Ryujinx.Common/Memory/ArrayPtr.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Ryujinx.Common/Memory/ArrayPtr.cs') diff --git a/src/Ryujinx.Common/Memory/ArrayPtr.cs b/src/Ryujinx.Common/Memory/ArrayPtr.cs index 9e95f75e..0365a508 100644 --- a/src/Ryujinx.Common/Memory/ArrayPtr.cs +++ b/src/Ryujinx.Common/Memory/ArrayPtr.cs @@ -16,12 +16,12 @@ namespace Ryujinx.Common.Memory /// /// Null pointer. /// - public static ArrayPtr Null => new ArrayPtr() { _ptr = IntPtr.Zero }; + public static ArrayPtr Null => new() { _ptr = IntPtr.Zero }; /// /// True if the pointer is null, false otherwise. /// - public bool IsNull => _ptr == IntPtr.Zero; + public readonly bool IsNull => _ptr == IntPtr.Zero; /// /// Number of elements on the array. @@ -37,7 +37,7 @@ namespace Ryujinx.Common.Memory /// /// Index of the element /// Reference to the element at the given index - public ref T this[int index] => ref Unsafe.AsRef((T*)_ptr + index); + public readonly ref T this[int index] => ref Unsafe.AsRef((T*)_ptr + index); /// /// Creates a new array from a given reference. @@ -81,7 +81,7 @@ namespace Ryujinx.Common.Memory /// /// Index where the new array should start /// New array starting at the specified position - public ArrayPtr Slice(int start) => new ArrayPtr(ref this[start], Length - start); + public ArrayPtr Slice(int start) => new(ref this[start], Length - start); /// /// Gets a span from the array. @@ -93,19 +93,19 @@ namespace Ryujinx.Common.Memory /// Gets the array base pointer. /// /// Base pointer - public T* ToPointer() => (T*)_ptr; + public readonly T* ToPointer() => (T*)_ptr; - public override bool Equals(object obj) + public readonly override bool Equals(object obj) { return obj is ArrayPtr other && Equals(other); } - public bool Equals([AllowNull] ArrayPtr other) + public readonly bool Equals([AllowNull] ArrayPtr other) { return _ptr == other._ptr && Length == other.Length; } - public override int GetHashCode() + public readonly override int GetHashCode() { return HashCode.Combine(_ptr, Length); } -- cgit v1.2.3