Use out variables.

Author: bgrainger

src/MySqlConnector/MySqlClient/ConnectionPool.cs

@@ -22,9 +22,8 @@ public async Task<MySqlSession> GetSessionAsync(IOBehavior ioBehavior, Cancellat
 
 			try
 			{
-				MySqlSession session;
 				// check for a pooled session
-				if (m_sessions.TryDequeue(out session))
+				if (m_sessions.TryDequeue(out var session))
 				{
 					if (session.PoolGeneration != m_generation || !await session.TryPingAsync(ioBehavior, cancellationToken).ConfigureAwait(false))
 					{
@@ -91,8 +90,7 @@ public async Task ClearAsync(IOBehavior ioBehavior, CancellationToken cancellati
 
 				try
 				{
-					MySqlSession session;
-					if (m_sessions.TryDequeue(out session))
+					if (m_sessions.TryDequeue(out var session))
 					{
 						if (session.PoolGeneration != m_generation)
 						{
@@ -122,8 +120,7 @@ public static ConnectionPool GetPool(ConnectionSettings cs)
 
 			var key = cs.ConnectionString;
 
-			ConnectionPool pool;
-			if (!s_pools.TryGetValue(key, out pool))
+			if (!s_pools.TryGetValue(key, out var pool))
 			{
 				pool = s_pools.GetOrAdd(cs.ConnectionString, newKey => new ConnectionPool(cs));
 			}

src/MySqlConnector/MySqlClient/MySqlConnection.cs

@@ -228,8 +228,7 @@ internal async Task<CachedProcedure> GetCachedProcedure(IOBehavior ioBehavior, s
 				m_cachedProcedures = new Dictionary<string, CachedProcedure>();
 
 			var normalized = NormalizedSchema.MustNormalize(name, Database);
-			CachedProcedure cachedProcedure;
-			if (!m_cachedProcedures.TryGetValue(normalized.FullyQualified, out cachedProcedure))
+			if (!m_cachedProcedures.TryGetValue(normalized.FullyQualified, out var cachedProcedure))
 			{
 				cachedProcedure = await CachedProcedure.FillAsync(ioBehavior, this, normalized.Schema, normalized.Component, cancellationToken).ConfigureAwait(false);
 				m_cachedProcedures[normalized.FullyQualified] = cachedProcedure;

src/MySqlConnector/MySqlClient/MySqlConnectionStringBuilder.cs

@@ -241,11 +241,8 @@ internal abstract class MySqlConnectionStringOption
 		public static readonly MySqlConnectionStringOption<bool> UseAffectedRows;
 		public static readonly MySqlConnectionStringOption<bool> UseCompression;
 
-		public static MySqlConnectionStringOption TryGetOptionForKey(string key)
-		{
-			MySqlConnectionStringOption option;
-			return s_options.TryGetValue(key, out option) ? option : null;
-		}
+		public static MySqlConnectionStringOption TryGetOptionForKey(string key) =>
+			s_options.TryGetValue(key, out var option) ? option : null;
 
 		public static MySqlConnectionStringOption GetOptionForKey(string key)
 		{
@@ -390,11 +387,8 @@ public MySqlConnectionStringOption(IReadOnlyList<string> keys, T defaultValue, F
 			m_coerce = coerce;
 		}
 
-		public T GetValue(MySqlConnectionStringBuilder builder)
-		{
-			object objectValue;
-			return builder.TryGetValue(Key, out objectValue) ? ChangeType(objectValue) : m_defaultValue;
-		}
+		public T GetValue(MySqlConnectionStringBuilder builder) =>
+			builder.TryGetValue(Key, out var objectValue) ? ChangeType(objectValue) : m_defaultValue;
 
 		public void SetValue(MySqlConnectionStringBuilder builder, T value)
 		{

src/MySqlConnector/MySqlClient/MySqlParameterCollection.cs

@@ -110,8 +110,7 @@ internal int NormalizedIndexOf(string parameterName)
 		{
 			if (parameterName == null)
 				throw new ArgumentNullException(nameof(parameterName));
-			int index;
-			return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out index) ? index : -1;
+			return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out var index) ? index : -1;
 		}
 
 		public override void Insert(int index, object value)
@@ -184,8 +183,7 @@ internal int FlexibleIndexOf(string parameterName)
 		{
 			if (parameterName == null)
 				throw new ArgumentNullException(nameof(parameterName));
-			int index;
-			return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out index) ? index : -1;
+			return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out var index) ? index : -1;
 		}
 
 		private void AddParameter(MySqlParameter parameter)

src/MySqlConnector/MySqlClient/Results/Row.cs

@@ -139,8 +139,7 @@ public Guid GetGuid(int ordinal)
 			if (value is Guid)
 				return (Guid) value;
 
-			Guid guid;
-			if (Guid.TryParse(value as string, out guid))
+			if (Guid.TryParse(value as string, out var guid))
 				return guid;
 
 			byte[] bytes = value as byte[];

src/MySqlConnector/MySqlClient/Types/TypeMapper.cs

@@ -109,15 +109,13 @@ private void AddColumnTypeMapping(ColumnTypeMapping columnTypeMapping)
 
 		internal DbTypeMapping GetDbTypeMapping(Type clrType)
 		{
-			DbTypeMapping dbTypeMapping;
-			m_dbTypeMappingsByClrType.TryGetValue(clrType, out dbTypeMapping);
+			m_dbTypeMappingsByClrType.TryGetValue(clrType, out var dbTypeMapping);
 			return dbTypeMapping;
 		}
 
 		internal DbTypeMapping GetDbTypeMapping(DbType dbType)
 		{
-			DbTypeMapping dbTypeMapping;
-			m_dbTypeMappingsByDbType.TryGetValue(dbType, out dbTypeMapping);
+			m_dbTypeMappingsByDbType.TryGetValue(dbType, out var dbTypeMapping);
 			return dbTypeMapping;
 		}
 
@@ -128,8 +126,7 @@ internal DbTypeMapping GetDbTypeMapping(string columnTypeName, bool unsigned=fal
 
 		internal ColumnTypeMapping GetColumnTypeMapping(string columnTypeName, bool unsigned=false, int length=0)
 		{
-			ColumnTypeMapping columnTypeMapping;
-			if (!m_columnTypeMappingLookup.TryGetValue(ColumnTypeMapping.CreateLookupKey(columnTypeName, unsigned, length), out columnTypeMapping) && length != 0)
+			if (!m_columnTypeMappingLookup.TryGetValue(ColumnTypeMapping.CreateLookupKey(columnTypeName, unsigned, length), out var columnTypeMapping) && length != 0)
 				m_columnTypeMappingLookup.TryGetValue(ColumnTypeMapping.CreateLookupKey(columnTypeName, unsigned, 0), out columnTypeMapping);
 			return columnTypeMapping;
 		}

src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs

@@ -41,8 +41,7 @@ public ValueTask<int> WritePayloadAsync(ArraySegment<byte> payload, IOBehavior i
 				if (m_uncompressedStream.Length == 0)
 					return default(ValueTask<int>);
 
-				ArraySegment<byte> uncompressedData;
-				if (!m_uncompressedStream.TryGetBuffer(out uncompressedData))
+				if (!m_uncompressedStream.TryGetBuffer(out var uncompressedData))
 					throw new InvalidOperationException("Couldn't get uncompressed stream buffer.");
 
 				return CompressAndWrite(uncompressedData, ioBehavior)