From dcae34ce47e2d8616dce1c73f3f4acdd9df31505 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 21 Jun 2020 08:19:56 +1000
Subject: [PATCH] Enable SA1314 and fix noncompliance

"Type parameter names should begin with T"
---
 Common.ruleset                                                | 3 ---
 .../tools/VirtualPads/schema/SaturnSchema.cs                  | 2 +-
 src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs          | 2 +-
 src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs               | 2 +-
 src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs                | 4 ++--
 src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs                   | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Common.ruleset b/Common.ruleset
index 0de14337a6..8faa394819 100644
--- a/Common.ruleset
+++ b/Common.ruleset
@@ -441,9 +441,6 @@
 
 		<!-- Parameter names should begin with lower-case letter -->
 		<Rule Id="SA1313" Action="Hidden" />
-
-		<!-- Type parameter names should begin with T -->
-		<Rule Id="SA1314" Action="Hidden" />
 	</Rules>
 
 	<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers.MaintainabilityRules">
diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
index bcffa17b42..28cad39b50 100644
--- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
@@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk
 	// ReSharper disable once UnusedMember.Global
 	public class SaturnSchema : IVirtualPadSchema
 	{
-		private static V GetOrDefault<K, V>(IDictionary<K, V> dict, K key)
+		private static TValue GetOrDefault<TKey, TValue>(IDictionary<TKey, TValue> dict, TKey key)
 		{
 			dict.TryGetValue(key, out var ret);
 			return ret;
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs
index e7ce9772f4..8e8b4507e2 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs
@@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Components.x86
 		public override string ToString() => $"{Addr:X6}:  {RawBytes,-12}  {Mnemonic,-8} {Args}";
 	}
 
-	public partial class x86<CpuType> where CpuType : struct, x86CpuType
+	public partial class x86<TCpu> where TCpu : struct, x86CpuType
 	{
 		private ushort ReadWord(int addr)
 		{
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs b/src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs
index e0efe02999..9dfe0ac01b 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs
@@ -2,7 +2,7 @@
 
 namespace BizHawk.Emulation.Cores.Components.x86
 {
-	public partial class x86<CpuType> where CpuType : struct, x86CpuType
+	public partial class x86<TCpu> where TCpu : struct, x86CpuType
 	{
 		public void Execute(int cycles)
 		{
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs b/src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs
index 44dcf9e1af..c74125169f 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs
@@ -1,6 +1,6 @@
 namespace BizHawk.Emulation.Cores.Components.x86
 {
-	public partial class x86<CpuType> where CpuType : struct, x86CpuType
+	public partial class x86<TCpu> where TCpu : struct, x86CpuType
 	{
 		// TODO test if static on these is a performance boost
 		// it would be appropriate if so because closed types have their own static variables
@@ -9,7 +9,7 @@
 
 		private void InitTiming()
 		{
-			if (typeof(CpuType) == typeof(Intel8086))
+			if (typeof(TCpu) == typeof(Intel8086))
 			{
 				timing_mov_ri8 = 4;
 				timing_mov_ri16 = 4;
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs b/src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs
index 7388b8b2d0..a5dcfa685f 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs
@@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Components.x86
 	public interface x86CpuType { }
 	public struct Intel8086 : x86CpuType { }
 
-	public sealed partial class x86<CpuType> where CpuType : struct, x86CpuType
+	public sealed partial class x86<TCpu> where TCpu : struct, x86CpuType
 	{
 		// Machine State
 		public Register16 RegAX;