aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-06-28 18:41:38 +0200
committerGitHub <noreply@github.com>2023-06-28 18:41:38 +0200
commitfc20d9b925b83532a19467293a7cdcbaa4ef3d6b (patch)
treeebe0e690b6644d0f825ee80f20e4067855f35cf4 /src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs
parent0a75b73fa43ddadf561ddeb0f923c6f3811c025b (diff)
[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<uint> * 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 <Acoustik666@gmail.com> * Fix return statements * Fix naming rule violations * Update src/Ryujinx.Common/Utilities/StreamUtils.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * 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 <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs')
-rw-r--r--src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs b/src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs
index 0063d91e..9e56f707 100644
--- a/src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs
+++ b/src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs
@@ -180,11 +180,6 @@ namespace Ryujinx.Common.Collections
parent.Right = child;
}
- if (ParentOf(element) == old)
- {
- parent = element;
- }
-
element.Color = old.Color;
element.Left = old.Left;
element.Right = old.Right;
@@ -258,11 +253,11 @@ namespace Ryujinx.Common.Collections
/// <param name="tree">Tree to search at</param>
/// <param name="key">Key of the node to be found</param>
/// <returns>Node that is equal to <paramref name="key"/></returns>
- public static N GetNodeByKey<N, K>(this IntrusiveRedBlackTree<N> tree, K key)
- where N : IntrusiveRedBlackTreeNode<N>, IComparable<N>, IComparable<K>
- where K : struct
+ public static TNode GetNodeByKey<TNode, TKey>(this IntrusiveRedBlackTree<TNode> tree, TKey key)
+ where TNode : IntrusiveRedBlackTreeNode<TNode>, IComparable<TNode>, IComparable<TKey>
+ where TKey : struct
{
- N node = tree.RootNode;
+ TNode node = tree.RootNode;
while (node != null)
{
int cmp = node.CompareTo(key);