Formatting tweaks (#3018)

martincostello · web-flow · commit ed3d603c7bc1 · 2026-04-03T15:39:44.000Z
- Add trailing commas.
- Use primary constructors.
- Use `is` instead of `==`.
- Simplify some pattern matching.
diff --git a/bench/Polly.Core.Benchmarks/PredicateBenchmark.cs b/bench/Polly.Core.Benchmarks/PredicateBenchmark.cs
@@ -19,7 +19,7 @@ public class PredicateBenchmark
             { Exception: IOException } => PredicateResult.True(),
             { Exception: InvalidOperationException } => PredicateResult.False(),
             _ => PredicateResult.False(),
-        }
+        },
     };
 
     private readonly RetryStrategyOptions<HttpResponseMessage> _builder = new()
diff --git a/bench/Polly.Core.Benchmarks/Utils/Helper.CircuitBreaker.cs b/bench/Polly.Core.Benchmarks/Utils/Helper.CircuitBreaker.cs
@@ -56,8 +56,8 @@ public static object CreateCircuitBreaker(PollyVersion technology)
                     {
                         { Exception: InvalidOperationException } => PredicateResult.True(),
                         { Result: string result } when result == Failure => PredicateResult.True(),
-                        _ => PredicateResult.False()
-                    }
+                        _ => PredicateResult.False(),
+                    },
                 });
             }),
             _ => throw new NotSupportedException()
@@ -81,5 +81,4 @@ protected internal override async ValueTask<Outcome<TResult>> ExecuteCore<TResul
             return result;
         }
     }
-
 }
diff --git a/bench/Polly.Core.Benchmarks/Utils/Helper.MultipleStrategies.cs b/bench/Polly.Core.Benchmarks/Utils/Helper.MultipleStrategies.cs
@@ -19,7 +19,7 @@ internal static partial class Helper
                 .AddConcurrencyLimiter(new ConcurrencyLimiterOptions
                 {
                     QueueLimit = 10,
-                    PermitLimit = 10
+                    PermitLimit = 10,
                 })
                 .AddTimeout(TimeSpan.FromSeconds(10))
                 .AddRetry(new()
@@ -31,8 +31,8 @@ internal static partial class Helper
                     {
                         { Exception: InvalidOperationException } => PredicateResult.True(),
                         { Result: string result } when result == Failure => PredicateResult.True(),
-                        _ => PredicateResult.False()
-                    }
+                        _ => PredicateResult.False(),
+                    },
                 })
                 .AddTimeout(TimeSpan.FromSeconds(1))
                 .AddCircuitBreaker(new()
@@ -45,8 +45,8 @@ internal static partial class Helper
                     {
                         { Exception: InvalidOperationException } => PredicateResult.True(),
                         { Result: string result } when result == Failure => PredicateResult.True(),
-                        _ => PredicateResult.False()
-                    }
+                        _ => PredicateResult.False(),
+                    },
                 });
 
             if (telemetry)
@@ -63,7 +63,7 @@ public static ResiliencePipeline CreateNonGenericStrategyPipeline(bool telemetry
             .AddConcurrencyLimiter(new ConcurrencyLimiterOptions
             {
                 QueueLimit = 10,
-                PermitLimit = 10
+                PermitLimit = 10,
             })
             .AddTimeout(TimeSpan.FromSeconds(10))
             .AddRetry(new()
@@ -75,7 +75,7 @@ public static ResiliencePipeline CreateNonGenericStrategyPipeline(bool telemetry
                 {
                     { Exception: InvalidOperationException } => PredicateResult.True(),
                     { Result: string result } when result == Failure => PredicateResult.True(),
-                    _ => PredicateResult.False()
+                    _ => PredicateResult.False(),
                 }
             })
             .AddTimeout(TimeSpan.FromSeconds(1))
@@ -89,8 +89,8 @@ public static ResiliencePipeline CreateNonGenericStrategyPipeline(bool telemetry
                 {
                     { Exception: InvalidOperationException } => PredicateResult.True(),
                     { Result: string result } when result == Failure => PredicateResult.True(),
-                    _ => PredicateResult.False()
-                }
+                    _ => PredicateResult.False(),
+                },
             });
 
         if (telemetry)
diff --git a/bench/Polly.Core.Benchmarks/Utils/Helper.Retry.cs b/bench/Polly.Core.Benchmarks/Utils/Helper.Retry.cs
@@ -25,12 +25,12 @@ public static object CreateRetry(PollyVersion technology)
                     {
                         { Exception: InvalidOperationException } => PredicateResult.True(),
                         { Result: string result } when result == Failure => PredicateResult.True(),
-                        _ => PredicateResult.False()
+                        _ => PredicateResult.False(),
                     },
-                    OnRetry = _ => default
+                    OnRetry = _ => default,
                 });
             }),
-            _ => throw new NotSupportedException()
+            _ => throw new NotSupportedException(),
         };
     }
 }
diff --git a/src/Polly.Core/Utils/Pipeline/BridgeComponentBase.cs b/src/Polly.Core/Utils/Pipeline/BridgeComponentBase.cs
@@ -1,10 +1,8 @@
 ﻿namespace Polly.Utils.Pipeline;
 
-internal abstract class BridgeComponentBase : PipelineComponent
+internal abstract class BridgeComponentBase(object strategy) : PipelineComponent
 {
-    private readonly object _strategy;
-
-    protected BridgeComponentBase(object strategy) => _strategy = strategy;
+    private readonly object _strategy = strategy;
 
     public override ValueTask DisposeAsync()
     {
diff --git a/src/Snippets/Docs/Chaos.Outcome.cs b/src/Snippets/Docs/Chaos.Outcome.cs
@@ -54,7 +54,7 @@ public static void OutcomeUsage()
                 ShouldHandle = static args => args.Outcome switch
                 {
                     { Result.StatusCode: HttpStatusCode.InternalServerError } => PredicateResult.True(),
-                    _ => PredicateResult.False()
+                    _ => PredicateResult.False(),
                 },
                 BackoffType = DelayBackoffType.Exponential,
                 UseJitter = true,
diff --git a/src/Snippets/Docs/Extensibility.cs b/src/Snippets/Docs/Extensibility.cs
@@ -15,9 +15,9 @@ public static void DelegateUsage()
                 ShouldHandle = args => args.Outcome switch
                 {
                     { Exception: InvalidOperationException } => PredicateResult.True(),
-                    { Result: string result } when result == "Failure" => PredicateResult.True(),
-                    { Result: int result } when result == -1 => PredicateResult.True(),
-                    _ => PredicateResult.False()
+                    { Result: string result } when result is "Failure" => PredicateResult.True(),
+                    { Result: int result } when result is -1 => PredicateResult.True(),
+                    _ => PredicateResult.False(),
                 },
             })
             .Build();
@@ -30,11 +30,11 @@ public static void DelegateUsage()
                 {
                     { Exception: InvalidOperationException } => PredicateResult.True(),
                     { Result: { } result } when result == "Failure" => PredicateResult.True(),
-                    _ => PredicateResult.False()
+                    _ => PredicateResult.False(),
                 },
             })
             .Build();
 
-        #endregion;
+        #endregion
     }
 }
diff --git a/src/Snippets/Docs/HttpClientIntegrations.cs b/src/Snippets/Docs/HttpClientIntegrations.cs
@@ -19,7 +19,7 @@ internal static class HttpClientIntegrations
         { Exception: HttpRequestException } => PredicateResult.True(),
         { Result.StatusCode: HttpStatusCode.RequestTimeout } => PredicateResult.True(),
         { Result.StatusCode: >= HttpStatusCode.InternalServerError } => PredicateResult.True(),
-        _ => PredicateResult.False()
+        _ => PredicateResult.False(),
     };
 
     private static RetryStrategyOptions<HttpResponseMessage> GetRetryOptions() =>
diff --git a/src/Snippets/Docs/Migration.Retry.cs b/src/Snippets/Docs/Migration.Retry.cs
@@ -183,8 +183,8 @@ public static void Retry_V8()
             ShouldHandle = static args => args.Outcome switch
             {
                 { Exception: SomeExceptionType } => PredicateResult.True(),
-                { Result: { StatusCode: HttpStatusCode.InternalServerError } } => PredicateResult.True(),
-                _ => PredicateResult.False()
+                { Result.StatusCode: HttpStatusCode.InternalServerError } => PredicateResult.True(),
+                _ => PredicateResult.False(),
             },
             MaxRetryAttempts = 3,
         })
diff --git a/src/Snippets/Docs/ResilienceStrategies.cs b/src/Snippets/Docs/ResilienceStrategies.cs
@@ -32,7 +32,7 @@ public static void ShouldHandleManual()
                 { Exception: HttpRequestException } => PredicateResult.True(),
                 { Exception: TimeoutRejectedException } => PredicateResult.True(), // You can handle multiple exceptions
                 { Result: HttpResponseMessage response } when !response.IsSuccessStatusCode => PredicateResult.True(),
-                _ => PredicateResult.False()
+                _ => PredicateResult.False(),
             }
         };
 
diff --git a/test/Polly.Core.Tests/Issues/IssuesTests.CircuitBreakerStateSharing_959.cs b/test/Polly.Core.Tests/Issues/IssuesTests.CircuitBreakerStateSharing_959.cs
@@ -15,10 +15,10 @@ public void CircuitBreakerStateSharing_959()
             ShouldHandle = args => args.Outcome.Result switch
             {
                 // handle int results
-                int intVal when intVal == -1 => new ValueTask<bool>(true),
+                int intVal when intVal is -1 => new ValueTask<bool>(true),
 
                 // handle string results
-                string stringVal when stringVal == "error" => new ValueTask<bool>(true),
+                string stringVal when stringVal is "error" => new ValueTask<bool>(true),
                 _ => new ValueTask<bool>(false),
             },
         };
diff --git a/test/Polly.Extensions.Tests/Issues/IssuesTests.OnCircuitBreakWithServiceProvider_796.cs b/test/Polly.Extensions.Tests/Issues/IssuesTests.OnCircuitBreakWithServiceProvider_796.cs
@@ -33,8 +33,8 @@ public async Task OnCircuitBreakWithServiceProvider_796()
                     ShouldHandle = args => args.Outcome.Result switch
                     {
                         string result when result == "error" => PredicateResult.True(),
-                        _ => PredicateResult.False()
-                    }
+                        _ => PredicateResult.False(),
+                    },
                 });
         });
 
@@ -55,11 +55,9 @@ public async Task OnCircuitBreakWithServiceProvider_796()
         contextChecked.ShouldBeTrue();
     }
 
-    private class ServiceProviderStrategy : ResilienceStrategy
+    private class ServiceProviderStrategy(IServiceProvider serviceProvider) : ResilienceStrategy
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        public ServiceProviderStrategy(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider;
+        private readonly IServiceProvider _serviceProvider = serviceProvider;
 
         protected override ValueTask<Outcome<TResult>> ExecuteCore<TResult, TState>(
             Func<ResilienceContext, TState, ValueTask<Outcome<TResult>>> callback,
diff --git a/test/Polly.Extensions.Tests/ReloadableResiliencePipelineTests.cs b/test/Polly.Extensions.Tests/ReloadableResiliencePipelineTests.cs
@@ -95,17 +95,11 @@ public void AddResiliencePipeline_EnsureReloadable(string? name)
         }
     }
 
-    public class ReloadableStrategy : ResilienceStrategy, IDisposable
+    public class ReloadableStrategy(string tag, IDisposable disposableResource) : ResilienceStrategy, IDisposable
     {
-        public ReloadableStrategy(string tag, IDisposable disposableResource)
-        {
-            Tag = tag;
-            DisposableResource = disposableResource;
-        }
-
-        public string Tag { get; }
+        public string Tag { get; } = tag;
 
-        public IDisposable DisposableResource { get; }
+        public IDisposable DisposableResource { get; } = disposableResource;
 
         public void Dispose() => DisposableResource.Dispose();
 
diff --git a/test/Polly.Extensions.Tests/Telemetry/TelemetryListenerImplTests.cs b/test/Polly.Extensions.Tests/Telemetry/TelemetryListenerImplTests.cs
@@ -593,11 +593,9 @@ private static void ReportEvent<TArgs>(
                 arg!,
                 outcome));
 
-    private class CallbackEnricher : MeteringEnricher
+    private class CallbackEnricher(Action<EnrichmentContext<object, object>> callback) : MeteringEnricher
     {
-        private readonly Action<EnrichmentContext<object, object>> _callback;
-
-        public CallbackEnricher(Action<EnrichmentContext<object, object>> callback) => _callback = callback;
+        private readonly Action<EnrichmentContext<object, object>> _callback = callback;
 
         public override void Enrich<TResult, TArgs>(in EnrichmentContext<TResult, TArgs> context) =>
             _callback(new EnrichmentContext<object, object>(context.TelemetryEvent.AsObjectArguments(), context.Tags));

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ public static object CreateCircuitBreaker(PollyVersion technology)`
`56`	`56`	`{`
`57`	`57`	`{ Exception: InvalidOperationException } => PredicateResult.True(),`
`58`	`58`	`{ Result: string result } when result == Failure => PredicateResult.True(),`
`59`		`- _ => PredicateResult.False()`
`60`		`- }`
	`59`	`+ _ => PredicateResult.False(),`
	`60`	`+ },`
`61`	`61`	`});`
`62`	`62`	`}),`
`63`	`63`	`_ => throw new NotSupportedException()`
`@@ -81,5 +81,4 @@ protected internal override async ValueTask<Outcome<TResult>> ExecuteCore<TResul`
`81`	`81`	`return result;`
`82`	`82`	`}`
`83`	`83`	`}`
`84`		`-`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ public static object CreateRetry(PollyVersion technology)`
`25`	`25`	`{`
`26`	`26`	`{ Exception: InvalidOperationException } => PredicateResult.True(),`
`27`	`27`	`{ Result: string result } when result == Failure => PredicateResult.True(),`
`28`		`- _ => PredicateResult.False()`
	`28`	`+ _ => PredicateResult.False(),`
`29`	`29`	`},`
`30`		`- OnRetry = _ => default`
	`30`	`+ OnRetry = _ => default,`
`31`	`31`	`});`
`32`	`32`	`}),`
`33`		`- _ => throw new NotSupportedException()`
	`33`	`+ _ => throw new NotSupportedException(),`
`34`	`34`	`};`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`namespace Polly.Utils.Pipeline;`
`2`	`2`
`3`		`-internal abstract class BridgeComponentBase : PipelineComponent`
	`3`	`+internal abstract class BridgeComponentBase(object strategy) : PipelineComponent`
`4`	`4`	`{`
`5`		`- private readonly object _strategy;`
`6`		`-`
`7`		`- protected BridgeComponentBase(object strategy) => _strategy = strategy;`
	`5`	`+ private readonly object _strategy = strategy;`
`8`	`6`
`9`	`7`	`public override ValueTask DisposeAsync()`
`10`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static void OutcomeUsage()`
`54`	`54`	`ShouldHandle = static args => args.Outcome switch`
`55`	`55`	`{`
`56`	`56`	`{ Result.StatusCode: HttpStatusCode.InternalServerError } => PredicateResult.True(),`
`57`		`- _ => PredicateResult.False()`
	`57`	`+ _ => PredicateResult.False(),`
`58`	`58`	`},`
`59`	`59`	`BackoffType = DelayBackoffType.Exponential,`
`60`	`60`	`UseJitter = true,`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static void ShouldHandleManual()`
`32`	`32`	`{ Exception: HttpRequestException } => PredicateResult.True(),`
`33`	`33`	`{ Exception: TimeoutRejectedException } => PredicateResult.True(), // You can handle multiple exceptions`
`34`	`34`	`{ Result: HttpResponseMessage response } when !response.IsSuccessStatusCode => PredicateResult.True(),`
`35`		`- _ => PredicateResult.False()`
	`35`	`+ _ => PredicateResult.False(),`
`36`	`36`	`}`
`37`	`37`	`};`
`38`	`38`