Use discard syntax

Author: teinarss

OpenRA.Game/Game.cs

@@ -355,7 +355,7 @@ static void Initialize(Arguments args)
 
 			ExternalMods = new ExternalMods();
 
-			if (modID != null && Mods.TryGetValue(modID, out var currentMod))
+			if (modID != null && Mods.TryGetValue(modID, out _))
 			{
 				var launchPath = args.GetValue("Engine.LaunchPath", Assembly.GetEntryAssembly().Location);
 

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -139,7 +139,7 @@ public class FrameCache
 
 		public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out var metadata));
+			frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out _));
 		}
 
 		public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }

OpenRA.Mods.Cnc/FileSystem/MixFile.cs

@@ -48,7 +48,7 @@ public MixFile(Stream s, string filename, HashSet<string> allPossibleFilenames)
 
 					List<PackageEntry> entries;
 					if (isEncrypted)
-						entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out var unused);
+						entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out _);
 					else
 						entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
 

OpenRA.Mods.Common/ColorValidator.cs

@@ -57,7 +57,7 @@ bool IsValid(Color askedColor, IEnumerable<Color> forbiddenColors, out Color for
 		public bool IsValid(Color askedColor, out Color forbiddenColor, IEnumerable<Color> terrainColors, IEnumerable<Color> playerColors, HashSet<string> errorMessages = null)
 		{
 			// Validate color against HSV
-			askedColor.ToAhsv(out var a, out var h, out var s, out var v);
+			askedColor.ToAhsv(out _, out _, out var s, out var v);
 			if (s < HsvSaturationRange[0] || s > HsvSaturationRange[1] || v < HsvValueRange[0] || v > HsvValueRange[1])
 			{
 				if (errorMessages != null)
@@ -93,7 +93,7 @@ public Color RandomPresetColor(MersenneTwister random, IEnumerable<Color> terrai
 			if (TeamColorPresets.Any())
 			{
 				foreach (var c in TeamColorPresets.Shuffle(random))
-					if (IsValid(c, out var forbidden, terrainColors, playerColors))
+					if (IsValid(c, out _, terrainColors, playerColors))
 						return c;
 			}
 
@@ -110,7 +110,7 @@ public Color RandomValidColor(MersenneTwister random, IEnumerable<Color> terrain
 				var v = float2.Lerp(HsvValueRange[0], HsvValueRange[1], random.NextFloat());
 				color = Color.FromAhsv(h, s, v);
 			}
-			while (!IsValid(color, out var forbidden, terrainColors, playerColors));
+			while (!IsValid(color, out _, terrainColors, playerColors));
 
 			return color;
 		}

OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs

@@ -108,7 +108,7 @@ protected override void Tick(Actor self)
 				// requestedTargetPresetForActivity will be cleared once the activity starts running and calls UpdateRequestedTarget
 				if (self.CurrentActivity != null && self.CurrentActivity.NextActivity == requestedTargetPresetForActivity)
 				{
-					RequestedTarget = RequestedTarget.Recalculate(self.Owner, out var targetIsHiddenActor);
+					RequestedTarget = RequestedTarget.Recalculate(self.Owner, out _);
 				}
 
 				// Requested activity has been canceled

OpenRA.Mods.Common/Traits/BotModules/Squads/States/AirStates.cs

@@ -85,7 +85,7 @@ protected static Actor FindDefenselessTarget(Squad owner)
 
 		protected static bool NearToPosSafely(Squad owner, WPos loc)
 		{
-			return NearToPosSafely(owner, loc, out var a);
+			return NearToPosSafely(owner, loc, out _);
 		}
 
 		protected static bool NearToPosSafely(Squad owner, WPos loc, out Actor detectedEnemyTarget)

OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs

@@ -49,7 +49,7 @@ void IUtilityCommand.Run(Utility utility, string[] args)
 			for (var i = 0; i < Palette.Size; i++)
 				palColors[i] = palette.GetColor(i);
 
-			var frames = FrameLoader.GetFrames(File.OpenRead(src), modData.SpriteLoaders, out var metadata);
+			var frames = FrameLoader.GetFrames(File.OpenRead(src), modData.SpriteLoaders, out _);
 
 			var usePadding = !args.Contains("--nopadding");
 			var count = 0;

OpenRA.Mods.Common/UtilityCommands/Rgba2Hex.cs

@@ -37,7 +37,7 @@ bool IUtilityCommand.ValidateArguments(string[] args)
 				{
 					foreach (var part in parts)
 					{
-						if (!byte.TryParse(part, out var component))
+						if (!byte.TryParse(part, out _))
 						{
 							invalid = true;
 							Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]);
@@ -125,7 +125,7 @@ bool IUtilityCommand.ValidateArguments(string[] args)
 				{
 					foreach (var part in parts)
 					{
-						if (!byte.TryParse(part, out var component))
+						if (!byte.TryParse(part, out _))
 						{
 							invalid = true;
 							Console.WriteLine("Invalid component in color (argument " + i + "): [" + part + "]: " + args[i]);

OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs

@@ -235,7 +235,7 @@ public void Set(float hue)
 
 		public void Set(Color color)
 		{
-			color.ToAhsv(out var a, out var h, out var s, out var v);
+			color.ToAhsv(out _, out var h, out var s, out var v);
 
 			if (H != h || S != s || V != v)
 			{

OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs

@@ -187,7 +187,7 @@ public ColorPickerLogic(Widget widget, ModData modData, World world, Color initi
 
 		static float HueFromColor(Color c)
 		{
-			c.ToAhsv(out var a, out var h, out var s, out var v);
+			c.ToAhsv(out _, out var h, out _, out _);
 			return h;
 		}
 

OpenRA.Platforms.Default/Sdl2PlatformWindow.cs

@@ -174,7 +174,7 @@ public Sdl2PlatformWindow(Size requestEffectiveWindowSize, WindowMode windowMode
 				// This is not necessary on macOS, which defines window sizes in effective units ("points").
 				if (Platform.CurrentPlatform == PlatformType.Windows)
 				{
-					if (SDL.SDL_GetDisplayDPI(videoDisplay, out var ddpi, out var hdpi, out var vdpi) == 0)
+					if (SDL.SDL_GetDisplayDPI(videoDisplay, out var ddpi, out _, out _) == 0)
 						windowScale = ddpi / 96;
 				}
 				else if (Platform.CurrentPlatform != PlatformType.OSX)

OpenRA.Platforms.Default/Shader.cs

@@ -57,7 +57,7 @@ protected uint CompileShaderObject(int type, string name)
 			{
 				OpenGL.glGetShaderiv(shader, OpenGL.GL_INFO_LOG_LENGTH, out var len);
 				var log = new StringBuilder(len);
-				OpenGL.glGetShaderInfoLog(shader, len, out var length, log);
+				OpenGL.glGetShaderInfoLog(shader, len, out _, log);
 
 				Log.Write("graphics", "GL Info Log:\n{0}", log.ToString());
 				throw new InvalidProgramException("Compile error in shader object '{0}'".F(filename));
@@ -104,7 +104,7 @@ public Shader(string name)
 				OpenGL.glGetProgramiv(program, OpenGL.GL_INFO_LOG_LENGTH, out var len);
 
 				var log = new StringBuilder(len);
-				OpenGL.glGetProgramInfoLog(program, len, out var length, log);
+				OpenGL.glGetProgramInfoLog(program, len, out _, log);
 				Log.Write("graphics", "GL Info Log:\n{0}", log.ToString());
 				throw new InvalidProgramException("Link error in shader program '{0}'".F(name));
 			}
@@ -120,7 +120,7 @@ public Shader(string name)
 			for (var i = 0; i < numUniforms; i++)
 			{
 				var sb = new StringBuilder(128);
-				OpenGL.glGetActiveUniform(program, i, 128, out var length, out var size, out var type, sb);
+				OpenGL.glGetActiveUniform(program, i, 128, out _, out _, out var type, sb);
 				var sampler = sb.ToString();
 				OpenGL.CheckGLError();