[Ryujinx.Memory] Address dotnet-format issues (#5386)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Silence dotnet format IDE0059 warnings

* Address or silence dotnet format IDE1006 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA1069 warnings

* Address remaining dotnet format analyzer warnings

* Address review comments

* 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

* Format if-blocks correctly

* Another rebase, another dotnet format run

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* Address review feedback

* Assign Decommit to ReplacePlaceholder

* Run final dotnet format pass

* Organize imports again

* Add trailing commas

* Add missing newline
This commit is contained in:
TSRBerry 2023-06-28 18:34:00 +02:00 committed by GitHub
parent 46b7c905f5
commit 0a75b73fa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 98 additions and 66 deletions

View file

@ -5,12 +5,12 @@ namespace Ryujinx.Memory.Range
/// <summary>
/// Range of memory composed of an address and size.
/// </summary>
public struct HostMemoryRange : IEquatable<HostMemoryRange>
public readonly struct HostMemoryRange : IEquatable<HostMemoryRange>
{
/// <summary>
/// An empty memory range, with a null address and zero size.
/// </summary>
public static HostMemoryRange Empty => new HostMemoryRange(0, 0);
public static HostMemoryRange Empty => new(0, 0);
/// <summary>
/// Start address of the range.
@ -67,5 +67,15 @@ namespace Ryujinx.Memory.Range
{
return HashCode.Combine(Address, Size);
}
public static bool operator ==(HostMemoryRange left, HostMemoryRange right)
{
return left.Equals(right);
}
public static bool operator !=(HostMemoryRange left, HostMemoryRange right)
{
return !(left == right);
}
}
}

View file

@ -28,4 +28,4 @@ namespace Ryujinx.Memory.Range
/// <returns>True if overlapping, false otherwise</returns>
bool OverlapsWith(ulong address, ulong size);
}
}
}

View file

@ -8,7 +8,7 @@
/// <summary>
/// An empty memory range, with a null address and zero size.
/// </summary>
public static MemoryRange Empty => new MemoryRange(0UL, 0);
public static MemoryRange Empty => new(0UL, 0);
/// <summary>
/// Start address of the range.

View file

@ -310,7 +310,7 @@ namespace Ryujinx.Memory.Range
return _singleRange.GetHashCode();
}
HashCode hash = new HashCode();
HashCode hash = new();
foreach (MemoryRange range in _ranges)
{
@ -328,5 +328,15 @@ namespace Ryujinx.Memory.Range
{
return HasSingleRange ? _singleRange.ToString() : string.Join(", ", _ranges);
}
public static bool operator ==(MultiRange left, MultiRange right)
{
return left.Equals(right);
}
public static bool operator !=(MultiRange left, MultiRange right)
{
return !(left == right);
}
}
}

View file

@ -238,7 +238,7 @@ namespace Ryujinx.Memory.Range
if (index < 0)
{
return default(T);
return default;
}
return _items[index].Value;
@ -398,7 +398,7 @@ namespace Ryujinx.Memory.Range
/// <returns>List index of the item, or complement index of nearest item with lower value on the list</returns>
private int BinarySearch(ulong address)
{
int left = 0;
int left = 0;
int right = Count - 1;
while (left <= right)
@ -435,7 +435,7 @@ namespace Ryujinx.Memory.Range
/// <returns>List index of the item, or complement index of nearest item with lower value on the list</returns>
private int BinarySearch(ulong address, ulong endAddress)
{
int left = 0;
int left = 0;
int right = Count - 1;
while (left <= right)
@ -480,4 +480,4 @@ namespace Ryujinx.Memory.Range
}
}
}
}
}