Use the same await using syntax.

lukebakken · lukebakken · commit 68cc34e6d584 · 2024-09-19T14:31:31.000-07:00
diff --git a/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.Recovery.cs
@@ -299,12 +299,14 @@ private async ValueTask RecoverExchangesAsync(IConnection connection,
             {
                 try
                 {
-                    var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                    await using var _ = channel.ConfigureAwait(false);
-                    await recordedExchange.RecoverAsync(channel, cancellationToken)
-                        .ConfigureAwait(false);
-                    await channel.CloseAsync(cancellationToken)
-                        .ConfigureAwait(false);
+                    IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    await using (channel.ConfigureAwait(false))
+                    {
+                        await recordedExchange.RecoverAsync(channel, cancellationToken)
+                            .ConfigureAwait(false);
+                        await channel.CloseAsync(cancellationToken)
+                            .ConfigureAwait(false);
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -350,7 +352,7 @@ private async Task RecoverQueuesAsync(IConnection connection,
                 try
                 {
                     string newName = string.Empty;
-                    var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
                     await using (channel.ConfigureAwait(false))
                     {
                         newName = await recordedQueue.RecoverAsync(channel, cancellationToken)
@@ -463,12 +465,14 @@ private async ValueTask RecoverBindingsAsync(IConnection connection,
             {
                 try
                 {
-                    var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                    await using var _ = channel.ConfigureAwait(false);
-                    await binding.RecoverAsync(channel, cancellationToken)
-                        .ConfigureAwait(false);
-                    await channel.CloseAsync(cancellationToken)
-                        .ConfigureAwait(false);
+                    IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    await using (channel.ConfigureAwait(false))
+                    {
+                        await binding.RecoverAsync(channel, cancellationToken)
+                            .ConfigureAwait(false);
+                        await channel.CloseAsync(cancellationToken)
+                            .ConfigureAwait(false);
+                    }
                 }
                 catch (Exception ex)
                 {

Original file line number	Diff line number	Diff line change
`@@ -299,12 +299,14 @@ private async ValueTask RecoverExchangesAsync(IConnection connection,`
`299`	`299`	`{`
`300`	`300`	`try`
`301`	`301`	`{`
`302`		`- var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);`
`303`		`- await using var _ = channel.ConfigureAwait(false);`
`304`		`- await recordedExchange.RecoverAsync(channel, cancellationToken)`
`305`		`- .ConfigureAwait(false);`
`306`		`- await channel.CloseAsync(cancellationToken)`
`307`		`- .ConfigureAwait(false);`
	`302`	`+ IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);`
	`303`	`+ await using (channel.ConfigureAwait(false))`
	`304`	`+ {`
	`305`	`+ await recordedExchange.RecoverAsync(channel, cancellationToken)`
	`306`	`+ .ConfigureAwait(false);`
	`307`	`+ await channel.CloseAsync(cancellationToken)`
	`308`	`+ .ConfigureAwait(false);`
	`309`	`+ }`
`308`	`310`	`}`
`309`	`311`	`catch (Exception ex)`
`310`	`312`	`{`
`@@ -350,7 +352,7 @@ private async Task RecoverQueuesAsync(IConnection connection,`
`350`	`352`	`try`
`351`	`353`	`{`
`352`	`354`	`string newName = string.Empty;`
`353`		`- var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);`
	`355`	`+ IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);`
`354`	`356`	`await using (channel.ConfigureAwait(false))`
`355`	`357`	`{`
`356`	`358`	`newName = await recordedQueue.RecoverAsync(channel, cancellationToken)`
`@@ -463,12 +465,14 @@ private async ValueTask RecoverBindingsAsync(IConnection connection,`
`463`	`465`	`{`
`464`	`466`	`try`
`465`	`467`	`{`
`466`		`- var channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);`
`467`		`- await using var _ = channel.ConfigureAwait(false);`
`468`		`- await binding.RecoverAsync(channel, cancellationToken)`
`469`		`- .ConfigureAwait(false);`
`470`		`- await channel.CloseAsync(cancellationToken)`
`471`		`- .ConfigureAwait(false);`
	`468`	`+ IChannel channel = await connection.CreateChannelAsync(cancellationToken: cancellationToken).ConfigureAwait(false);`
	`469`	`+ await using (channel.ConfigureAwait(false))`
	`470`	`+ {`
	`471`	`+ await binding.RecoverAsync(channel, cancellationToken)`
	`472`	`+ .ConfigureAwait(false);`
	`473`	`+ await channel.CloseAsync(cancellationToken)`
	`474`	`+ .ConfigureAwait(false);`
	`475`	`+ }`
`472`	`476`	`}`
`473`	`477`	`catch (Exception ex)`
`474`	`478`	`{`