Rerun dotnet format after manual fixes

src/BizHawk.Client.Common/tools/Watch/Watch.cs

@@ -150,7 +150,7 @@ public static Watch GenerateWatch(MemoryDomain domain, long address, WatchSize s
 		/// <returns>True if both watch are equals; otherwise, false</returns>
 		public static bool operator ==(Watch a, Watch b)
 		{
-			if (ReferenceEquals(a, null) || ReferenceEquals(b, null))
+			if (a is null || b is null)
 			{
 				return false;
 			}
@@ -171,7 +171,7 @@ public static Watch GenerateWatch(MemoryDomain domain, long address, WatchSize s
 		/// <returns>True if they are equals; otherwise, false</returns>
 		public static bool operator ==(Watch a, Cheat b)
 		{
-			if (ReferenceEquals(a, null) || ReferenceEquals(b, null))
+			if (a is null || b is null)
 			{
 				return false;
 			}
@@ -325,7 +325,7 @@ public void ClearChangeCount()
 		/// <returns>True if both object are equals; otherwise, false</returns>
 		public bool Equals(Watch other)
 		{
-			if (ReferenceEquals(other, null))
+			if (other is null)
 			{
 				return false;
 			}
@@ -342,7 +342,7 @@ public bool Equals(Watch other)
 		/// <returns>True if both object are equals; otherwise, false</returns>
 		public bool Equals(Cheat other)
 		{
-			return !ReferenceEquals(other, null)
+			return other is not null
 				&& _domain == other.Domain
 				&& Address == other.Address
 				&& Size == other.Size;

src/BizHawk.Client.Common/tools/Watch/WatchList/WatchEqualityComparer.cs

@@ -18,12 +18,12 @@ private class WatchEqualityComparer : IEqualityComparer<Watch>
 			/// <returns>True if <see cref="Watch"/> are equal; otherwise, false</returns>
 			public bool Equals(Watch x, Watch y)
 			{
-				if (ReferenceEquals(x, null))
+				if (x is null)
 				{
-					return ReferenceEquals(y, null);
+					return y is null;
 				}
 
-				if (ReferenceEquals(y, null))
+				if (y is null)
 				{
 					return false;
 				}

src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs

@@ -37,7 +37,7 @@ public override int GetHashCode()
 
 		public static bool operator ==(Cell a, Cell b)
 		{
-			return a?.Equals(b) ?? ReferenceEquals(b, null);
+			return a?.Equals(b) ?? b is null;
 		}
 
 		public static bool operator !=(Cell a, Cell b)

src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.ConsoleID.cs

@@ -117,7 +117,7 @@ protected ConsoleID SystemIdToConsoleId()
 				VSystemID.Raw.GB => ConsoleID.GB,
 				VSystemID.Raw.GBA => ConsoleID.GBA,
 				VSystemID.Raw.GBC => ConsoleID.GBC, // Not actually used
-				VSystemID.Raw.GBL when Emu is ILinkedGameBoyCommon { First: { IsCGBMode: true } } => ConsoleID.GBC,
+				VSystemID.Raw.GBL when Emu is ILinkedGameBoyCommon { First.IsCGBMode: true } => ConsoleID.GBC,
 				VSystemID.Raw.GBL => ConsoleID.GB, // actually can be a mix of GB and GBC
 				VSystemID.Raw.GEN when Emu is GPGX { IsMegaCD: true } => ConsoleID.SegaCD,
 				VSystemID.Raw.GEN when Emu is PicoDrive { Is32XActive: true } => ConsoleID.Sega32X,

src/BizHawk.Common/EndiannessUtils.cs

@@ -31,10 +31,8 @@ public static void MutatingByteSwap32(Span<byte> a)
 			fixed (byte* p = &a[0]) for (var i = 0; i < l; i += 4)
 			{
 					(p[i + 3], p[i]) = (p[i], p[i + 3]);
-					var b = p[i + 1];
-				p[i + 1] = p[i + 2];
-				p[i + 2] = b;
-			}
+					(p[i + 2], p[i + 1]) = (p[i + 1], p[i + 2]);
+				}
 #else
 			Debug.Assert(a.Length % 4 == 0);
 			var ints = MemoryMarshal.Cast<byte, uint>(a);

src/BizHawk.Emulation.Cores/CPUs/Z80A/Operations.cs

@@ -651,9 +651,7 @@ public void ADDS_Func(ushort dest_l, ushort dest_h, ushort src_l, ushort src_h)
 		public void EXCH_16_Func(ushort dest_l, ushort dest_h, ushort src_l, ushort src_h)
 		{
 			(Regs[src_l], Regs[dest_l]) = (Regs[dest_l], Regs[src_l]);
-			var temp = Regs[dest_h];
-			Regs[dest_h] = Regs[src_h];
-			Regs[src_h] = temp;
+			(Regs[src_h], Regs[dest_h]) = (Regs[dest_h], Regs[src_h]);
 		}
 
 		public void SBC_16_Func(ushort dest_l, ushort dest_h, ushort src_l, ushort src_h)

src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs

@@ -12,19 +12,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
     */
 	public partial class NECUPD765
 	{
-		/// <summary>
-		/// The current Z80 cycle
-		/// </summary>
-		private long CurrentCPUCycle
-		{
-			get
-			{
-				if (_machine == null)
-					return 0;
-				else
-					return _machine.CPU.TotalExecutedCycles;
-			}
-		}
 
 		/// <summary>
 		/// The last CPU cycle when the FDC accepted an IO read/write

src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs

@@ -12,24 +12,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
     */
     public partial class NECUPD765
     {
-        /// <summary>
-        /// The current Z80 cycle
-        /// </summary>
-        private long CurrentCPUCycle
-        {
-            get
-            {
-                if (_machine == null)
-                    return 0;
-                else
-                    return _machine.CPU.TotalExecutedCycles;
-            }
-        }
 
-        /// <summary>
-        /// The last CPU cycle when the FDC accepted an IO read/write
-        /// </summary>
-        private long LastCPUCycle;
+		/// <summary>
+		/// The last CPU cycle when the FDC accepted an IO read/write
+		/// </summary>
+		private long LastCPUCycle;
 
         /// <summary>
         /// The current delay figure (in Z80 t-states)

src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs

@@ -48,22 +48,7 @@ private struct CDLog_MapResults
 		}
 
 		private delegate CDLog_MapResults MapMemoryDelegate(ushort addr, bool write);
-		private readonly MapMemoryDelegate MapMemory;
 #pragma warning restore CS0649
 		private ICodeDataLog CDL;
-
-		private void RunCDL(ushort address, CDLog_Flags flags)
-		{
-			if (MapMemory != null)
-			{
-				CDLog_MapResults results = MapMemory(address, false);
-				switch (results.Type)
-				{
-					case CDLog_AddrType.None: break;
-					case CDLog_AddrType.RAM: CDL["RAM"][results.Address] |= (byte)flags; break;
-					case CDLog_AddrType.ROM: CDL["ROM"][results.Address] |= (byte)flags; break;
-				}
-			}
-		}
 	}
 }