nits

Author: adamsitnik

src/benchmarks/micro/libraries/Microsoft.Extensions.Logging/EventSourceBenchmark.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.DependencyInjection;
@@ -59,19 +58,13 @@ public void Setup()
         }
 
         [GlobalCleanup]
-        public void Cleanup()
-        {
-            _listener?.Dispose();
-        }
+        public void Cleanup() => _listener?.Dispose();
 
         private class TestEventListener : EventListener
         {
             private readonly EventKeywords _keywords;
 
-            public TestEventListener(EventKeywords keywords)
-            {
-                _keywords = keywords;
-            }
+            public TestEventListener(EventKeywords keywords) => _keywords = keywords;
 
             protected override void OnEventSourceCreated(System.Diagnostics.Tracing.EventSource eventSource)
             {

src/benchmarks/micro/libraries/Microsoft.Extensions.Logging/LoggingOverheadBenchmark.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.DependencyInjection;
 using MicroBenchmarks;

src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs

@@ -49,7 +49,6 @@ public int ContainsKey_17_Int_32ByteValue()
         public int ContainsKey_17_Int_32ByteRefsValue() 
             => ContainsKey_Int_LargeRefStruct(_dict32ByteRefsValue_17, Seventeen);
 
-
         [Benchmark(OperationsPerInvoke = ThreeThousand)]
         public int ContainsValue_3k_Int_Int() 
             => ContainsKey_Int_Int(_dict_3k, ThreeThousand);
@@ -62,7 +61,6 @@ public int ContainsKey_3k_Int_32ByteValue()
         public int ContainsKey_3k_Int_32ByteRefsValue()
             => ContainsKey_Int_LargeRefStruct(_dict32ByteRefsValue_3k, ThreeThousand);
 
-
         private static int ContainsKey_Int_Int(Dictionary<int, int> d, int count)
         {
             int total = 0;
@@ -120,7 +118,6 @@ public int TryGetValue_17_Int_32ByteValue()
         public int TryGetValue_17_Int_32ByteRefsValue()
             => TryGetValue_Int_LargeRefStruct(_dict32ByteRefsValue_17, Seventeen);
 
-
         [Benchmark(OperationsPerInvoke = ThreeThousand)]
         public int TryGetValue_3k_Int_Int()
             => TryGetValue_Int_Int(_dict_3k, ThreeThousand);

src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Extensions;
 using MicroBenchmarks;
 
 namespace System.Drawing.Tests

src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs

@@ -58,7 +58,7 @@ public void Setup()
             _diffAtFirstChar = new string(copy);
         }
 
-        [Benchmark] // the most work to do: the strings have same conent, but don't point to the same memory
+        [Benchmark] // the most work to do: the strings have same content, but don't point to the same memory
         public int Compare_Same() => Options.CultureInfo.CompareInfo.Compare(_value, _same, Options.CompareOptions);
 
         [Benchmark] // the most work to do for IgnoreCase: every char needs to be compared and uppercased

src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs

@@ -133,10 +133,7 @@ public class Perf_OrderBy
         private Person[] _people;
 
         [GlobalSetup]
-        public void GlobalSetup()
-        {
-            _people = PersonData.Generate(NumberOfPeople);
-        }
+        public void GlobalSetup() => _people = PersonData.Generate(NumberOfPeople);
 
         [Benchmark]
         public void OrderByString() => _people.OrderBy(p => p.FirstName).Consume(_consumer);

src/benchmarks/micro/libraries/System.Text.Json/Document/EnumerateArray.cs

@@ -63,7 +63,7 @@ public void EnumerateUsingIndexer()
             int arrayLength = _element.GetArrayLength();
             for (int j = 0; j < arrayLength; j++)
             {
-                JsonElement dummy = _element[j];
+                _ = _element[j];
             }
         }
     }

src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadMissingAndCaseInsensitive.cs

@@ -5,10 +5,10 @@
 using BenchmarkDotNet.Attributes;
 using MicroBenchmarks;
 using MicroBenchmarks.Serializers;
-using Newtonsoft.Json.Serialization;
 
 namespace System.Text.Json.Serialization.Tests
 {
+    [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
     [GenericTypeArguments(typeof(Location))]
     public class ReadMissingAndCaseInsensitive<T>
     {
@@ -42,29 +42,25 @@ public void Setup()
         /// Uses default settings of case-sensitive comparison and JSON that matches the Pascal-casing
         /// of the properties on the class.
         /// </summary>
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public T Baseline() => JsonSerializer.Deserialize<T>(_serialized, _optionsBaseline);
 
         /// <summary>
         /// Properties are missing because the comparison is case-sensitive and the JSON uses camel-casing
         /// which does not match the properties on the class.
         /// </summary>
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public T MissingProperties() => JsonSerializer.Deserialize<T>(_serializedCamelCased, _optionsBaseline);
 
         /// <summary>
         /// Case-insensitive is enabled and the casing in JSON matches the properties on the class.
         /// </summary>
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public T CaseInsensitiveMatching() => JsonSerializer.Deserialize<T>(_serialized, _optionsCaseInsensitive);
 
         /// <summary>
         /// Case-insensitive is enabled and the casing in JSON does not match the properties on the class.
         /// </summary>
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public T CaseInsensitiveNotMatching() => JsonSerializer.Deserialize<T>(_serializedCamelCased, _optionsCaseInsensitive);
     }

src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs

@@ -13,6 +13,7 @@
 
 namespace System.Text.Json.Serialization.Tests
 {
+    [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
     [GenericTypeArguments(typeof(LoginViewModel))]
     [GenericTypeArguments(typeof(Location))]
     [GenericTypeArguments(typeof(IndexViewModel))]
@@ -44,27 +45,23 @@ public async Task Setup()
             _objectWithObjectProperty = new { Prop = (object)_value };
         }
 
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
+        [GlobalCleanup]
+        public void Cleanup() => _memoryStream.Dispose();
+
         [Benchmark]
         public string SerializeToString() => JsonSerializer.Serialize(_value);
 
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public byte[] SerializeToUtf8Bytes() => JsonSerializer.SerializeToUtf8Bytes(_value);
 
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public async Task SerializeToStream()
         {
             _memoryStream.Position = 0;
             await JsonSerializer.SerializeAsync(_memoryStream, _value);
         }
 
-        [BenchmarkCategory(Categories.Libraries, Categories.JSON)]
         [Benchmark]
         public string SerializeObjectProperty() => JsonSerializer.Serialize(_objectWithObjectProperty);
-
-        [GlobalCleanup]
-        public void Cleanup() => _memoryStream.Dispose();
     }
 }

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs

@@ -27,8 +27,7 @@ public void Setup()
 
             // Results in a lot + and /
             byte[] dataWithEscaping = Enumerable.Range(0, NumberOfBytes)
-                .Select(i => i % 2 == 0 ? 0xFB : 0xFF)
-                .Select(i => (byte)i)
+                .Select(i => i % 2 == 0 ? (byte)0xFB : (byte)0xFF)
                 .ToArray();
 
             _base64NoEscaping = Write(dataWithNoEscaping);

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs

@@ -4,10 +4,7 @@
 
 using BenchmarkDotNet.Attributes;
 using MicroBenchmarks;
-using Newtonsoft.Json;
 using System.Buffers;
-using System.IO;
-using System.Runtime.CompilerServices;
 
 namespace System.Text.Json.Tests
 {

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs

@@ -7,7 +7,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Buffers;
-using System.Collections.Generic;
 using System.IO;
 using System.Memory;
 

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs

@@ -45,7 +45,6 @@ public void WriteDateTimes()
 
             using (var json = new Utf8JsonWriter(_arrayBufferWriter, new JsonWriterOptions { Indented = Formatted, SkipValidation = SkipValidation }))
             {
-
                 json.WriteStartArray();
                 for (int i = 0; i < DataSize; i++)
                 {

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs

@@ -59,9 +59,9 @@ public void Setup()
         public void WriteDeepUtf8()
         {
             _arrayBufferWriter.Clear();
+
             using (var json = new Utf8JsonWriter(_arrayBufferWriter, new JsonWriterOptions { Indented = Formatted, SkipValidation = SkipValidation }))
             {
-
                 json.WriteStartObject();
                 for (int i = 0; i < Depth; i++)
                 {
@@ -90,9 +90,9 @@ public void WriteDeepUtf8()
         public void WriteDeepUtf16()
         {
             _arrayBufferWriter.Clear();
+
             using (var json = new Utf8JsonWriter(_arrayBufferWriter, new JsonWriterOptions { Indented = Formatted, SkipValidation = SkipValidation }))
             {
-
                 json.WriteStartObject();
                 for (int i = 0; i < Depth; i++)
                 {

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs

@@ -56,9 +56,9 @@ private static double NextDouble(Random random, double minValue, double maxValue
         public void WriteDoubles()
         {
             _arrayBufferWriter.Clear();
+
             using (var json = new Utf8JsonWriter(_arrayBufferWriter, new JsonWriterOptions { Indented = Formatted, SkipValidation = SkipValidation }))
             {
-
                 json.WriteStartArray();
                 for (int i = 0; i < DataSize; i++)
                 {

src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs

@@ -40,9 +40,9 @@ public void Setup()
         public void WriteGuids()
         {
             _arrayBufferWriter.Clear();
+
             using (var json = new Utf8JsonWriter(_arrayBufferWriter, new JsonWriterOptions { Indented = Formatted, SkipValidation = SkipValidation }))
             {
-
                 json.WriteStartArray();
                 for (int i = 0; i < DataSize; i++)
                 {

src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs

@@ -104,7 +104,7 @@ private static string[] CreatePatterns(int total, int unique)
             }
 
             // shuffle:
-            const int someSeed = 101;  // seed for reproducability
+            const int someSeed = 101;  // const seed for reproducability
             var random = new Random(someSeed);
             for (var i = 0; i < total; i++)
             {

src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs

@@ -6,7 +6,6 @@
 using System.Threading.Tasks.Sources;
 using System.Threading.Tasks.Tests;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
 using MicroBenchmarks;
 
 namespace System.Threading.Tasks

src/benchmarks/micro/libraries/System/Hashing.cs

@@ -21,7 +21,7 @@ public class Hashing
         /// see https://github.com/dotnet/corefx/blob/8252ecc2eb0da08cd474a303b646e111d74d2a71/src/Common/src/CoreLib/System/String.Comparison.cs#L749
         /// </summary>
         [GlobalSetup]
-        public void Setup() => _string = new string(Enumerable.Repeat('a', BytesCount / (sizeof(char)/ sizeof(byte))).ToArray());
+        public void Setup() => _string = new string('a', BytesCount / (sizeof(char)/ sizeof(byte)));
 
         [Benchmark]
         public int GetStringHashCode() => _string.GetHashCode();