Skip to content

Commit 3d1456a

Browse files
bgraingerbgrainger
committed
Use static lambdas.
1 parent a1f3b67 commit 3d1456a

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎src/MySqlConnector.Logging.Microsoft.Extensions.Logging/MicrosoftExtensionsLoggingLoggerProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public void Log(MySqlConnectorLogLevel level, string message, object?[]? args =
3535
_ => throw new ArgumentOutOfRangeException(nameof(level), level, "Invalid value for 'level'.")
3636
};
3737

38-
static readonly Func<string, Exception, string> s_getMessage = (s, e) => s;
39-
static readonly Func<(string Message, object?[] Args), Exception, string> s_messageFormatter = (s, e) => string.Format(CultureInfo.InvariantCulture, s.Message, s.Args);
38+
static readonly Func<string, Exception, string> s_getMessage = static (s, e) => s;
39+
static readonly Func<(string Message, object?[] Args), Exception, string> s_messageFormatter = static (s, e) => string.Format(CultureInfo.InvariantCulture, s.Message, s.Args);
4040

4141
readonly ILogger m_logger;
4242
}

‎src/MySqlConnector/Core/CachedProcedure.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private CachedProcedure(string schema, string component, IReadOnlyList<CachedPar
114114
internal MySqlParameterCollection AlignParamsWithDb(MySqlParameterCollection? parameterCollection)
115115
{
116116
var alignedParams = new MySqlParameterCollection();
117-
var returnParam = parameterCollection?.FirstOrDefault(x => x.Direction == ParameterDirection.ReturnValue);
117+
var returnParam = parameterCollection?.FirstOrDefault(static x => x.Direction == ParameterDirection.ReturnValue);
118118

119119
foreach (var cachedParam in Parameters)
120120
{

‎src/MySqlConnector/Core/ConnectionPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ private sealed class LeastConnectionsLoadBalancer : ILoadBalancer
509509
public IEnumerable<string> LoadBalance(IReadOnlyList<string> hosts)
510510
{
511511
lock (m_hostSessions)
512-
return m_hostSessions.OrderBy(x => x.Value).Select(x => x.Key).ToList();
512+
return m_hostSessions.OrderBy(static x => x.Value).Select(static x => x.Key).ToList();
513513
}
514514

515515
readonly Dictionary<string, int> m_hostSessions;

‎src/MySqlConnector/Core/IValuesEnumerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ internal sealed class DataReaderValuesEnumerator : IValuesEnumerator
5353
#if !NETSTANDARD1_3
5454
internal sealed class DataRowsValuesEnumerator : IValuesEnumerator
5555
{
56-
public static IValuesEnumerator Create(DataTable dataTable) => new DataRowsValuesEnumerator(dataTable.Rows.Cast<DataRow>().Where(x => x is not null).Select(x => x!), dataTable.Columns.Count);
56+
public static IValuesEnumerator Create(DataTable dataTable) => new DataRowsValuesEnumerator(dataTable.Rows.Cast<DataRow>().Where(static x => x is not null).Select(static x => x!), dataTable.Columns.Count);
5757

5858
public DataRowsValuesEnumerator(IEnumerable<DataRow> dataRows, int columnCount)
5959
{

‎src/MySqlConnector/Core/SchemaProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ private async Task FillDataTableAsync(IOBehavior ioBehavior, DataTable dataTable
998998
using (var command = m_connection.CreateCommand())
999999
{
10001000
#pragma warning disable CA2100
1001-
command.CommandText = "SELECT " + string.Join(", ", dataTable.Columns.Cast<DataColumn>().Select(x => x!.ColumnName)) + " FROM INFORMATION_SCHEMA." + tableName + ";";
1001+
command.CommandText = "SELECT " + string.Join(", ", dataTable.Columns.Cast<DataColumn>().Select(static x => x!.ColumnName)) + " FROM INFORMATION_SCHEMA." + tableName + ";";
10021002
#pragma warning restore CA2100
10031003
using var reader = await command.ExecuteReaderAsync(default, ioBehavior, cancellationToken).ConfigureAwait(false);
10041004
while (await reader.ReadAsync(ioBehavior, cancellationToken).ConfigureAwait(false))

‎src/MySqlConnector/Core/TypeMapper.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ private TypeMapper()
2323
m_mySqlDbTypeToColumnTypeMetadata = new();
2424

2525
// boolean
26-
var typeBoolean = AddDbTypeMapping(new(typeof(bool), new[] { DbType.Boolean }, convert: o => Convert.ToBoolean(o)));
26+
var typeBoolean = AddDbTypeMapping(new(typeof(bool), new[] { DbType.Boolean }, convert: static o => Convert.ToBoolean(o)));
2727
AddColumnTypeMetadata(new("TINYINT", typeBoolean, MySqlDbType.Bool, isUnsigned: false, length: 1, columnSize: 1, simpleDataTypeName: "BOOL", createFormat: "BOOL"));
2828

2929
// integers
30-
var typeSbyte = AddDbTypeMapping(new(typeof(sbyte), new[] { DbType.SByte }, convert: o => Convert.ToSByte(o)));
31-
var typeByte = AddDbTypeMapping(new(typeof(byte), new[] { DbType.Byte }, convert: o => Convert.ToByte(o)));
32-
var typeShort = AddDbTypeMapping(new(typeof(short), new[] { DbType.Int16 }, convert: o => Convert.ToInt16(o)));
33-
var typeUshort = AddDbTypeMapping(new(typeof(ushort), new[] { DbType.UInt16 }, convert: o => Convert.ToUInt16(o)));
34-
var typeInt = AddDbTypeMapping(new(typeof(int), new[] { DbType.Int32 }, convert: o => Convert.ToInt32(o)));
35-
var typeUint = AddDbTypeMapping(new(typeof(uint), new[] { DbType.UInt32 }, convert: o => Convert.ToUInt32(o)));
36-
var typeLong = AddDbTypeMapping(new(typeof(long), new[] { DbType.Int64 }, convert: o => Convert.ToInt64(o)));
37-
var typeUlong = AddDbTypeMapping(new(typeof(ulong), new[] { DbType.UInt64 }, convert: o => Convert.ToUInt64(o)));
30+
var typeSbyte = AddDbTypeMapping(new(typeof(sbyte), new[] { DbType.SByte }, convert: static o => Convert.ToSByte(o)));
31+
var typeByte = AddDbTypeMapping(new(typeof(byte), new[] { DbType.Byte }, convert: static o => Convert.ToByte(o)));
32+
var typeShort = AddDbTypeMapping(new(typeof(short), new[] { DbType.Int16 }, convert: static o => Convert.ToInt16(o)));
33+
var typeUshort = AddDbTypeMapping(new(typeof(ushort), new[] { DbType.UInt16 }, convert: static o => Convert.ToUInt16(o)));
34+
var typeInt = AddDbTypeMapping(new(typeof(int), new[] { DbType.Int32 }, convert: static o => Convert.ToInt32(o)));
35+
var typeUint = AddDbTypeMapping(new(typeof(uint), new[] { DbType.UInt32 }, convert: static o => Convert.ToUInt32(o)));
36+
var typeLong = AddDbTypeMapping(new(typeof(long), new[] { DbType.Int64 }, convert: static o => Convert.ToInt64(o)));
37+
var typeUlong = AddDbTypeMapping(new(typeof(ulong), new[] { DbType.UInt64 }, convert: static o => Convert.ToUInt64(o)));
3838
AddColumnTypeMetadata(new("TINYINT", typeSbyte, MySqlDbType.Byte, isUnsigned: false));
3939
AddColumnTypeMetadata(new("TINYINT", typeByte, MySqlDbType.UByte, isUnsigned: true, length: 1));
4040
AddColumnTypeMetadata(new("TINYINT", typeByte, MySqlDbType.UByte, isUnsigned: true));
@@ -49,9 +49,9 @@ private TypeMapper()
4949
AddColumnTypeMetadata(new("BIT", typeUlong, MySqlDbType.Bit));
5050

5151
// decimals
52-
var typeDecimal = AddDbTypeMapping(new(typeof(decimal), new[] { DbType.Decimal, DbType.Currency, DbType.VarNumeric }, convert: o => Convert.ToDecimal(o)));
53-
var typeDouble = AddDbTypeMapping(new(typeof(double), new[] { DbType.Double }, convert: o => Convert.ToDouble(o)));
54-
var typeFloat = AddDbTypeMapping(new(typeof(float), new[] { DbType.Single }, convert: o => Convert.ToSingle(o)));
52+
var typeDecimal = AddDbTypeMapping(new(typeof(decimal), new[] { DbType.Decimal, DbType.Currency, DbType.VarNumeric }, convert: static o => Convert.ToDecimal(o)));
53+
var typeDouble = AddDbTypeMapping(new(typeof(double), new[] { DbType.Double }, convert: static o => Convert.ToDouble(o)));
54+
var typeFloat = AddDbTypeMapping(new(typeof(float), new[] { DbType.Single }, convert: static o => Convert.ToSingle(o)));
5555
AddColumnTypeMetadata(new("DECIMAL", typeDecimal, MySqlDbType.NewDecimal, createFormat: "DECIMAL({0},{1});precision,scale"));
5656
AddColumnTypeMetadata(new("DECIMAL", typeDecimal, MySqlDbType.Decimal));
5757
AddColumnTypeMetadata(new("DOUBLE", typeDouble, MySqlDbType.Double));
@@ -95,7 +95,7 @@ private TypeMapper()
9595
var typeDate = AddDbTypeMapping(new(typeof(DateTime), new[] { DbType.Date }));
9696
var typeDateTime = AddDbTypeMapping(new(typeof(DateTime), new[] { DbType.DateTime, DbType.DateTime2, DbType.DateTimeOffset }));
9797
AddDbTypeMapping(new(typeof(DateTimeOffset), new[] { DbType.DateTimeOffset }));
98-
var typeTime = AddDbTypeMapping(new(typeof(TimeSpan), new[] { DbType.Time }, convert: o => o is string s ? Utility.ParseTimeSpan(Encoding.UTF8.GetBytes(s)) : Convert.ChangeType(o, typeof(TimeSpan))));
98+
var typeTime = AddDbTypeMapping(new(typeof(TimeSpan), new[] { DbType.Time }, convert: static o => o is string s ? Utility.ParseTimeSpan(Encoding.UTF8.GetBytes(s)) : Convert.ChangeType(o, typeof(TimeSpan))));
9999
AddColumnTypeMetadata(new("DATETIME", typeDateTime, MySqlDbType.DateTime));
100100
AddColumnTypeMetadata(new("DATE", typeDate, MySqlDbType.Date));
101101
AddColumnTypeMetadata(new("DATE", typeDate, MySqlDbType.Newdate));
@@ -104,7 +104,7 @@ private TypeMapper()
104104
AddColumnTypeMetadata(new("YEAR", typeInt, MySqlDbType.Year));
105105

106106
// guid
107-
var typeGuid = AddDbTypeMapping(new(typeof(Guid), new[] { DbType.Guid }, convert: o => Guid.Parse(Convert.ToString(o)!)));
107+
var typeGuid = AddDbTypeMapping(new(typeof(Guid), new[] { DbType.Guid }, convert: static o => Guid.Parse(Convert.ToString(o)!)));
108108
AddColumnTypeMetadata(new("CHAR", typeGuid, MySqlDbType.Guid, length: 36, simpleDataTypeName: "CHAR(36)", createFormat: "CHAR(36)"));
109109

110110
// null

‎src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public IByteHandler ByteHandler
3939
public ValueTask<ArraySegment<byte>> ReadPayloadAsync(ArraySegmentHolder<byte> cache, ProtocolErrorBehavior protocolErrorBehavior, IOBehavior ioBehavior)
4040
{
4141
using var compressedByteHandler = new CompressedByteHandler(this, protocolErrorBehavior);
42-
return ProtocolUtility.ReadPayloadAsync(m_bufferedByteReader, compressedByteHandler, () => -1, cache, protocolErrorBehavior, ioBehavior);
42+
return ProtocolUtility.ReadPayloadAsync(m_bufferedByteReader, compressedByteHandler, static () => -1, cache, protocolErrorBehavior, ioBehavior);
4343
}
4444

4545
public ValueTask<int> WritePayloadAsync(ReadOnlyMemory<byte> payload, IOBehavior ioBehavior)

0 commit comments

Comments
 (0)