use some patterns (#1739)

serilog · Sep 1, 2022 · 70e729d · 70e729d
1 parent c5a5b44
commit 70e729d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/src/Serilog/Configuration/LoggerEnrichmentConfiguration.cs b/src/Serilog/Configuration/LoggerEnrichmentConfiguration.cs
@@ -178,7 +178,7 @@ public LoggerConfiguration AtLevel(LoggingLevelSwitch levelSwitch, Action<Logger
         var wrappedEnricher = wrapEnricher(enclosed);
 
         // ReSharper disable once SuspiciousTypeConversion.Global
-        if (!(wrappedEnricher is IDisposable))
+        if (wrappedEnricher is not IDisposable)
         {
             SelfLog.WriteLine("Wrapping enricher {0} does not implement IDisposable; to ensure " +
                               "wrapped enrichers are properly disposed, wrappers should dispose " +

diff --git a/src/Serilog/Configuration/LoggerSinkConfiguration.cs b/src/Serilog/Configuration/LoggerSinkConfiguration.cs
@@ -147,7 +147,7 @@ internal LoggerSinkConfiguration(LoggerConfiguration loggerConfiguration, Action
     {
         if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-        if (logger is Logger concreteLogger && concreteLogger.HasOverrideMap)
+        if (logger is Logger {HasOverrideMap: true})
         {
             SelfLog.WriteLine("Minimum level overrides are not supported on sub-loggers " +
                               "and may be removed completely in a future version.");
@@ -240,7 +240,7 @@ public LoggerConfiguration Conditional(Func<LogEvent, bool> condition, Action<Lo
             new DisposingAggregateSink(sinksToWrap);
 
         var wrappedSink = wrapSink(enclosed);
-        if (!(wrappedSink is IDisposable) && enclosed is IDisposable target)
+        if (wrappedSink is not IDisposable && enclosed is IDisposable target)
         {
             wrappedSink = new DisposeDelegatingSink(wrappedSink, target);
         }

diff --git a/src/Serilog/Core/Sinks/DisposingAggregateSink.cs b/src/Serilog/Core/Sinks/DisposingAggregateSink.cs
@@ -49,7 +49,7 @@ public void Dispose()
     {
         foreach (var sink in _sinks)
         {
-            if (!(sink is IDisposable disposable)) continue;
+            if (sink is not IDisposable disposable) continue;
 
             try
             {

diff --git a/src/Serilog/Filters/Matching.cs b/src/Serilog/Filters/Matching.cs
@@ -98,9 +98,8 @@ public static class Matching
         {
             if (!e.Properties.TryGetValue(propertyName, out var propertyValue)) return false;
 
-            return propertyValue is ScalarValue s &&
-                   ((s.Value is TScalar value) &&
-                    predicate(value));
+            return propertyValue is ScalarValue {Value: TScalar value} &&
+                   predicate(value);
         };
     }
 }
diff --git a/test/TestDummies/DummyAnonymousUserFilter.cs b/test/TestDummies/DummyAnonymousUserFilter.cs
@@ -8,7 +8,7 @@ public bool IsEnabled(LogEvent logEvent)
         {
             if (logEvent.Properties["User"] is ScalarValue sv)
             {
-                if (sv.Value is string s && s == "anonymous")
+                if (sv.Value is "anonymous")
                 {
                     return false;
                 }