Skip to content

Commit 5dc007d

Browse files
committed
Use static local functions.
1 parent 2e480a1 commit 5dc007d

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/MySqlConnector/Core/ServerSession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ private async Task GetRealServerDetailsAsync(IOBehavior ioBehavior, Cancellation
12991299

13001300
// first (and only) row
13011301
payload = await ReceiveReplyAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false);
1302-
void ReadRow(ReadOnlySpan<byte> span, out int? connectionId_, out byte[] serverVersion_)
1302+
static void ReadRow(ReadOnlySpan<byte> span, out int? connectionId_, out byte[] serverVersion_)
13031303
{
13041304
var reader = new ByteArrayReader(span);
13051305
var length = reader.ReadLengthEncodedIntegerOrNull();

src/MySqlConnector/Protocol/Serialization/ProtocolUtility.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,7 @@ private static ValueTask<Packet> ReadPacketAsync(BufferedByteReader bufferedByte
409409
return ReadPacketAfterHeader(headerBytesTask.Result, bufferedByteReader, byteHandler, getNextSequenceNumber, protocolErrorBehavior, ioBehavior);
410410
return AddContinuation(headerBytesTask, bufferedByteReader, byteHandler, getNextSequenceNumber, protocolErrorBehavior, ioBehavior);
411411

412-
// NOTE: use a local function (with no captures) to defer creation of lambda objects
413-
ValueTask<Packet> AddContinuation(ValueTask<ArraySegment<byte>> headerBytes_, BufferedByteReader bufferedByteReader_, IByteHandler byteHandler_, Func<int> getNextSequenceNumber_, ProtocolErrorBehavior protocolErrorBehavior_, IOBehavior ioBehavior_) =>
412+
static ValueTask<Packet> AddContinuation(ValueTask<ArraySegment<byte>> headerBytes_, BufferedByteReader bufferedByteReader_, IByteHandler byteHandler_, Func<int> getNextSequenceNumber_, ProtocolErrorBehavior protocolErrorBehavior_, IOBehavior ioBehavior_) =>
414413
headerBytes_.ContinueWith(x => ReadPacketAfterHeader(x, bufferedByteReader_, byteHandler_, getNextSequenceNumber_, protocolErrorBehavior_, ioBehavior_));
415414
}
416415

@@ -435,8 +434,7 @@ private static ValueTask<Packet> ReadPacketAfterHeader(ArraySegment<byte> header
435434
return CreatePacketFromPayload(payloadBytesTask.Result, payloadLength, protocolErrorBehavior, packetOutOfOrderException);
436435
return AddContinuation(payloadBytesTask, payloadLength, protocolErrorBehavior, packetOutOfOrderException);
437436

438-
// NOTE: use a local function (with no captures) to defer creation of lambda objects
439-
ValueTask<Packet> AddContinuation(ValueTask<ArraySegment<byte>> payloadBytesTask_, int payloadLength_, ProtocolErrorBehavior protocolErrorBehavior_, Exception packetOutOfOrderException_)
437+
static ValueTask<Packet> AddContinuation(ValueTask<ArraySegment<byte>> payloadBytesTask_, int payloadLength_, ProtocolErrorBehavior protocolErrorBehavior_, Exception packetOutOfOrderException_)
440438
=> payloadBytesTask_.ContinueWith(x => CreatePacketFromPayload(x, payloadLength_, protocolErrorBehavior_, packetOutOfOrderException_));
441439
}
442440

@@ -477,8 +475,7 @@ private static ValueTask<ArraySegment<byte>> DoReadPayloadAsync(BufferedByteRead
477475

478476
return AddContinuation(readPacketTask, bufferedByteReader, byteHandler, getNextSequenceNumber, previousPayloads, protocolErrorBehavior, ioBehavior);
479477

480-
// NOTE: use a local function (with no captures) to defer creation of lambda objects
481-
ValueTask<ArraySegment<byte>> AddContinuation(ValueTask<Packet> readPacketTask_, BufferedByteReader bufferedByteReader_, IByteHandler byteHandler_, Func<int> getNextSequenceNumber_, ArraySegmentHolder<byte> previousPayloads_, ProtocolErrorBehavior protocolErrorBehavior_, IOBehavior ioBehavior_)
478+
static ValueTask<ArraySegment<byte>> AddContinuation(ValueTask<Packet> readPacketTask_, BufferedByteReader bufferedByteReader_, IByteHandler byteHandler_, Func<int> getNextSequenceNumber_, ArraySegmentHolder<byte> previousPayloads_, ProtocolErrorBehavior protocolErrorBehavior_, IOBehavior ioBehavior_)
482479
{
483480
return readPacketTask_.ContinueWith(packet =>
484481
HasReadPayload(previousPayloads_, packet, protocolErrorBehavior_, out var result_) ? result_ :
@@ -518,8 +515,7 @@ public static ValueTask<int> WritePayloadAsync(IByteHandler byteHandler, Func<in
518515
return payload.Count <= MaxPacketSize ? WritePacketAsync(byteHandler, getNextSequenceNumber(), payload, ioBehavior) :
519516
CreateTask(byteHandler, getNextSequenceNumber, payload, ioBehavior);
520517

521-
// NOTE: use a local function (with no captures) to defer creation of lambda objects
522-
ValueTask<int> CreateTask(IByteHandler byteHandler_, Func<int> getNextSequenceNumber_, ArraySegment<byte> payload_, IOBehavior ioBehavior_)
518+
static ValueTask<int> CreateTask(IByteHandler byteHandler_, Func<int> getNextSequenceNumber_, ArraySegment<byte> payload_, IOBehavior ioBehavior_)
523519
{
524520
var writeTask = default(ValueTask<int>);
525521
for (var bytesSent = 0; bytesSent < payload_.Count; bytesSent += MaxPacketSize)
@@ -546,8 +542,7 @@ private static ValueTask<int> WritePacketAsync(IByteHandler byteHandler, int seq
546542
}
547543
return AddContinuation(task, buffer);
548544

549-
// NOTE: use a local function (with no captures) to defer creation of lambda objects
550-
ValueTask<int> AddContinuation(ValueTask<int> task_, byte[] buffer_)
545+
static ValueTask<int> AddContinuation(ValueTask<int> task_, byte[] buffer_)
551546
{
552547
return task_.ContinueWith(x =>
553548
{

0 commit comments

Comments
 (0)