From 6b06d50085a1643815039a62dfade71e62d8be62 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Sat, 29 Mar 2025 08:05:38 +1000
Subject: [PATCH] Enable CA1868 and fix noncompliance

"Unnecessary call to 'Contains' for sets"
---
 .global.editorconfig.ini               |  2 ++
 src/BizHawk.Client.EmuHawk/MainForm.cs |  4 +---
 src/BizHawk.Common/Log.cs              | 16 +++-------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.global.editorconfig.ini b/.global.editorconfig.ini
index 7737c59e4e..9fdebbb41f 100644
--- a/.global.editorconfig.ini
+++ b/.global.editorconfig.ini
@@ -99,6 +99,8 @@ dotnet_diagnostic.CA1854.severity = warning
 dotnet_diagnostic.CA1860.severity = error
 # Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
 dotnet_diagnostic.CA1862.severity = error
+# Unnecessary call to 'Contains' for sets
+dotnet_diagnostic.CA1868.severity = warning
 
 ## Reliability rules
 
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 8c5022c6b6..338d6596c7 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2140,10 +2140,8 @@ namespace BizHawk.Client.EmuHawk
 			var sysID = Emulator.SystemId;
 			for (var i = 0; i < sysID.Length; i++)
 			{
-				var upper = char.ToUpperInvariant(sysID[i]);
-				if (AvailableAccelerators.Contains(upper))
+				if (AvailableAccelerators.Remove(char.ToUpperInvariant(sysID[i])))
 				{
-					AvailableAccelerators.Remove(upper);
 					sysID = sysID.Insert(i, "&");
 					break;
 				}
diff --git a/src/BizHawk.Common/Log.cs b/src/BizHawk.Common/Log.cs
index 8689e91ad1..d729e8d43f 100644
--- a/src/BizHawk.Common/Log.cs
+++ b/src/BizHawk.Common/Log.cs
@@ -19,23 +19,13 @@ namespace BizHawk.Common
 		}
 
 		// -------------- Logging Domain Configuration --------------
-		private static readonly List<string> EnabledLogDomains = new List<string>();
+		private static readonly HashSet<string> EnabledLogDomains = new();
 
 		public static void EnableDomain(string domain)
-		{
-			if (!EnabledLogDomains.Contains(domain))
-			{
-				EnabledLogDomains.Add(domain);
-			}
-		}
+			=> EnabledLogDomains.Add(domain);
 
 		public static void DisableDomain(string domain)
-		{
-			if (EnabledLogDomains.Contains(domain))
-			{
-				EnabledLogDomains.Remove(domain);
-			}
-		}
+			=> EnabledLogDomains.Remove(domain);
 
 		// -------------- Logging Action Configuration --------------
 #pragma warning disable CA2211 // public field