Suppress some warnings, tidy up some namespacing (#1888)

serilog · Mar 30, 2023 · 8bb02df · 8bb02df
1 parent 29d842d
commit 8bb02df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/Serilog/ReusableStringWriter.cs → ...Serilog/Rendering/ReusableStringWriter.cs b/src/Serilog/ReusableStringWriter.cs → ...Serilog/Rendering/ReusableStringWriter.cs
@@ -1,9 +1,9 @@
-namespace Serilog;
+namespace Serilog.Rendering;
 
 /// <summary>
 /// Class that provides reusable StringWriters to reduce memory allocations
 /// </summary>
-internal class ReusableStringWriter : StringWriter
+class ReusableStringWriter : StringWriter
 {
     [ThreadStatic]
     static ReusableStringWriter? _pooledWriter;

diff --git a/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs b/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if NET6_0_OR_GREATER
-using System.Diagnostics.CodeAnalysis;
-#endif
-
 namespace Serilog.Settings.KeyValuePairs;
 
 #if !NET5_0
@@ -250,7 +246,7 @@ static void ApplyDirectives(List<IGrouping<string, ConfigurationMethodCall>> dir
                             select SuppressConvertCall(directive, p)).ToList();
 
                 // Work around inability to annotate lambdas in query expressions. The parent *must* have RUC for safety.
-                [System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("Trimming", "IL2026")]
+                [UnconditionalSuppressMessage("Trimming", "IL2026")]
                 object? SuppressConvertCall(ConfigurationMethodCall? directive, ParameterInfo p)
                     => directive == null ? p.DefaultValue : ConvertOrLookupByName(directive.Value, p.ParameterType, declaredSwitches);
 

diff --git a/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs b/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs
@@ -1,4 +1,5 @@
-// ReSharper disable UnusedAutoPropertyAccessor.Global, UnusedParameter.Local
+// ReSharper disable UnusedAutoPropertyAccessor.Global, UnusedParameter.Local, ParameterOnlyUsedForPreconditionCheck.Local, RedundantExplicitNullableCreation, MemberHidesStaticFromOuterClass
+// ReSharper disable UnusedAutoPropertyAccessor.Local, UnusedMemberInSuper.Global, UnusedMember.Local, UseObjectOrCollectionInitializer, UnusedAutoPropertyAccessor.Local
 
 namespace Serilog.Tests.Capturing;
 
@@ -53,7 +54,7 @@ void DoThreadTest(object logObject, Action<string?> assertAction)
 
                 Assert.IsType<StructureValue>(propValue);
 
-                var result = ((StructureValue)propValue).Properties.SingleOrDefault(p => p.Name == "Root")?.Value?.ToString();
+                var result = ((StructureValue)propValue).Properties.SingleOrDefault(p => p.Name == "Root")?.Value.ToString();
 
                 assertAction.Invoke(result);
             }
@@ -63,7 +64,7 @@ void DoThreadTest(object logObject, Action<string?> assertAction)
     [Fact]
     public void UnderDestructuringAByteArrayIsAScalarValue()
     {
-        var pv = _converter.CreatePropertyValue(new byte[0], Destructuring.Destructure);
+        var pv = _converter.CreatePropertyValue(Array.Empty<byte>(), Destructuring.Destructure);
         Assert.IsType<ScalarValue>(pv);
         Assert.IsType<string>(((ScalarValue)pv).Value);
     }
@@ -79,7 +80,7 @@ public void UnderDestructuringABooleanIsAScalarValue()
     [Fact]
     public void UnderDestructuringAnIntegerArrayIsASequenceValue()
     {
-        var pv = _converter.CreatePropertyValue(new int[0], Destructuring.Destructure);
+        var pv = _converter.CreatePropertyValue(Array.Empty<int>(), Destructuring.Destructure);
         Assert.IsType<SequenceValue>(pv);
     }
 
@@ -93,9 +94,7 @@ public void ByDefaultADestructuredNullNullableIsAScalarNull()
     [Fact]
     public void ByDefaultADestructuredNonNullNullableIsItsValue()
     {
-        // ReSharper disable RedundantExplicitNullableCreation
         var pv = _converter.CreatePropertyValue(new int?(2), Destructuring.Destructure);
-        // ReSharper restore RedundantExplicitNullableCreation
         Assert.Equal(2, ((ScalarValue)pv).Value);
     }
 
@@ -106,9 +105,7 @@ class A
 
     class B
     {
-        // ReSharper disable UnusedAutoPropertyAccessor.Local
         public A? A { get; set; }
-        // ReSharper restore UnusedAutoPropertyAccessor.Local
     }
 
     [Fact]
@@ -128,8 +125,6 @@ struct C
 
     class D
     {
-        // ReSharper disable once MemberHidesStaticFromOuterClass
-        // ReSharper disable once UnusedAutoPropertyAccessor.Local
         public IList<C?>? C { get; set; }
     }
 
@@ -225,7 +220,7 @@ public void ByteSpansAreConvertedToTheSameStringsAsArrays(int length)
         [Fact]
         public void FailsGracefullyWhenAccessingPropertiesViaReflectionThrows()
         {
-            var thrower = new int[] { 1, 2, 3 }.AsMemory();
+            var thrower = new[] { 1, 2, 3 }.AsMemory();
 
             var pv = _converter.CreatePropertyValue(thrower, Destructuring.Destructure);
             var sv = (StructureValue)pv;