From 74bfff149ea592813c496139f2f40b694ce5a1a8 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 31 Aug 2018 08:24:41 +1200 Subject: [PATCH 1/2] Use var in for loops (#758) --- .../Matching/JumpTableSingleEntryBenchmark.cs | 6 +++--- .../Matching/BarebonesMatcherConformanceTest.cs | 2 +- .../Matching/DfaMatcherConformanceTest.cs | 2 +- .../Matching/RouteMatcherConformanceTest.cs | 2 +- .../Patterns/RoutePatternParserTest.cs | 4 ++-- .../Template/TemplateParserTests.cs | 4 ++-- .../Tree/TreeRouterTest.cs | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/benchmarks/Microsoft.AspNetCore.Routing.Performance/Matching/JumpTableSingleEntryBenchmark.cs b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Matching/JumpTableSingleEntryBenchmark.cs index 690c1788b8..1f676ce5ad 100644 --- a/benchmarks/Microsoft.AspNetCore.Routing.Performance/Matching/JumpTableSingleEntryBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Matching/JumpTableSingleEntryBenchmark.cs @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Routing.Matching var segments = _segments; int destination = 0; - for (int i = 0; i < strings.Length; i++) + for (var i = 0; i < strings.Length; i++) { var @string = strings[i]; var segment = segments[i]; @@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Routing.Matching var segments = _segments; var destination = 0; - for (int i = 0; i < strings.Length; i++) + for (var i = 0; i < strings.Length; i++) { destination = _implementation.GetDestination(strings[i], segments[i]); } @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Routing.Matching var segments = _segments; var destination = 0; - for (int i = 0; i < strings.Length; i++) + for (var i = 0; i < strings.Length; i++) { destination = _prototype.GetDestination(strings[i], segments[i]); } diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/BarebonesMatcherConformanceTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/BarebonesMatcherConformanceTest.cs index bedc07a206..a8745ef2ed 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/BarebonesMatcherConformanceTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/BarebonesMatcherConformanceTest.cs @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Routing.Matching internal override Matcher CreateMatcher(params RouteEndpoint[] endpoints) { var builder = new BarebonesMatcherBuilder(); - for (int i = 0; i < endpoints.Length; i++) + for (var i = 0; i < endpoints.Length; i++) { builder.AddEndpoint(endpoints[i]); } diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/DfaMatcherConformanceTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/DfaMatcherConformanceTest.cs index 5d44e62ab0..5f55304b02 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/DfaMatcherConformanceTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/DfaMatcherConformanceTest.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Routing.Matching .BuildServiceProvider(); var builder = services.GetRequiredService(); - for (int i = 0; i < endpoints.Length; i++) + for (var i = 0; i < endpoints.Length; i++) { builder.AddEndpoint(endpoints[i]); } diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/RouteMatcherConformanceTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/RouteMatcherConformanceTest.cs index 5daf2cae95..1690696951 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/RouteMatcherConformanceTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/RouteMatcherConformanceTest.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Routing.Matching internal override Matcher CreateMatcher(params RouteEndpoint[] endpoints) { var builder = new RouteMatcherBuilder(); - for (int i = 0; i < endpoints.Length; i++) + for (var i = 0; i < endpoints.Length; i++) { builder.AddEndpoint(endpoints[i]); } diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Patterns/RoutePatternParserTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Patterns/RoutePatternParserTest.cs index 1a1f131091..b564805d31 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Patterns/RoutePatternParserTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Patterns/RoutePatternParserTest.cs @@ -665,7 +665,7 @@ namespace Microsoft.AspNetCore.Routing.Patterns return false; } - for (int i = 0; i < x.PathSegments.Count; i++) + for (var i = 0; i < x.PathSegments.Count; i++) { if (x.PathSegments[i].Parts.Count != y.PathSegments[i].Parts.Count) { @@ -686,7 +686,7 @@ namespace Microsoft.AspNetCore.Routing.Patterns return false; } - for (int i = 0; i < x.Parameters.Count; i++) + for (var i = 0; i < x.Parameters.Count; i++) { if (!Equals(x.Parameters[i], y.Parameters[i])) { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs index 39f2a1159e..77813d0232 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs @@ -840,7 +840,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests return false; } - for (int i = 0; i < x.Segments.Count; i++) + for (var i = 0; i < x.Segments.Count; i++) { if (x.Segments[i].Parts.Count != y.Segments[i].Parts.Count) { @@ -861,7 +861,7 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests return false; } - for (int i = 0; i < x.Parameters.Count; i++) + for (var i = 0; i < x.Parameters.Count; i++) { if (!Equals(x.Parameters[i], y.Parameters[i])) { diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs index 37ba101520..f18cb657bc 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs +++ b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Routing.Tree var expectedRouteGroup = CreateRouteGroup(0, "{parameter1=1}/{parameter2=2}/{parameter3=3}/{*parameter4=4}"); var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" }; var expectedRouteValues = new RouteValueDictionary(); - for (int i = 0; i < routeValueKeys.Length; i++) + for (var i = 0; i < routeValueKeys.Length; i++) { expectedRouteValues.Add(routeValueKeys[i], routeValues[i]); } @@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Routing.Tree var expectedRouteGroup = CreateRouteGroup(0, "{parameter1=1}/{parameter2=2}/{parameter3=3}/{parameter4=4}"); var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" }; var expectedRouteValues = new RouteValueDictionary(); - for (int i = 0; i < routeValueKeys.Length; i++) + for (var i = 0; i < routeValueKeys.Length; i++) { expectedRouteValues.Add(routeValueKeys[i], routeValues[i]); } @@ -262,7 +262,7 @@ namespace Microsoft.AspNetCore.Routing.Tree var expectedRouteGroup = CreateRouteGroup(0, "{parameter1:int=1}/{parameter2:int=2}/{parameter3:int=3}/{parameter4:int=4}"); var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" }; var expectedRouteValues = new RouteValueDictionary(); - for (int i = 0; i < routeValueKeys.Length; i++) + for (var i = 0; i < routeValueKeys.Length; i++) { expectedRouteValues.Add(routeValueKeys[i], routeValues[i]); } @@ -305,7 +305,7 @@ namespace Microsoft.AspNetCore.Routing.Tree var expectedRouteGroup = CreateRouteGroup(0, "{parameter1=1}/{parameter2=2}/{parameter3=3}/{*parameter4=4}"); var routeValueKeys = new[] { "parameter1", "parameter2", "parameter3", "parameter4" }; var expectedRouteValues = new RouteValueDictionary(); - for (int i = 0; i < routeValueKeys.Length; i++) + for (var i = 0; i < routeValueKeys.Length; i++) { expectedRouteValues.Add(routeValueKeys[i], routeValues[i]); } From 8395ad834046dbc505a82a804f83d04e2df56fa7 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Thu, 30 Aug 2018 13:10:07 -0700 Subject: [PATCH 2/2] remove references to ref emit packages --- .../Microsoft.AspNetCore.Routing.csproj | 2 -- .../Microsoft.AspNetCore.Routing.Tests.csproj | 1 - 2 files changed, 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj b/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj index 495fe45caa..a2ff4ab1ba 100644 --- a/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj +++ b/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj @@ -38,7 +38,5 @@ Microsoft.AspNetCore.Routing.RouteCollection - - diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj index 57c4d063fa..540f151fed 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj +++ b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj @@ -28,7 +28,6 @@ -