From d61586c6a1b10583dd66e457a0484974963acfd0 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Fri, 2 Oct 2015 16:47:23 -0400 Subject: [PATCH 1/3] Use Jit recongised, standard loop construct For bounds check elimination. --- src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs b/src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs index 50f2b22005..c9a814eaac 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Hosting.Startup var serviceProvider = builder.ApplicationServices; var parameterInfos = MethodInfo.GetParameters(); var parameters = new object[parameterInfos.Length]; - for (var index = 0; index != parameterInfos.Length; ++index) + for (var index = 0; index < parameterInfos.Length; index++) { var parameterInfo = parameterInfos[index]; if (parameterInfo.ParameterType == typeof(IApplicationBuilder)) @@ -54,4 +54,4 @@ namespace Microsoft.AspNet.Hosting.Startup MethodInfo.Invoke(instance, parameters); } } -} \ No newline at end of file +} From 797962b60801b2bce54e8159f6b70d490e07105e Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Fri, 2 Oct 2015 16:56:39 -0400 Subject: [PATCH 2/3] Simpler loop construct --- src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs b/src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs index 70b6befd8d..924b30ebbf 100644 --- a/src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs +++ b/src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs @@ -509,9 +509,10 @@ namespace Microsoft.AspNet.Hosting.Startup private static IEnumerable FlattenAndReverseExceptionTree(Exception ex) { var list = new List(); - for (; ex != null; ex = ex.InnerException) + while (ex != null) { list.Add(ex); + ex = ex.InnerException; } list.Reverse(); return list; From e3298992e7bdacbe5ffce9c0b0c97093e4f32d96 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Fri, 2 Oct 2015 16:57:34 -0400 Subject: [PATCH 3/3] use var --- src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs | 2 +- test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs b/src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs index 48b47b4706..1835b55e52 100644 --- a/src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs +++ b/src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Server.Testing CancellationToken cancellationToken = default(CancellationToken), int retryCount = 60) { - for (int retry = 0; retry < retryCount; retry++) + for (var retry = 0; retry < retryCount; retry++) { if (cancellationToken.IsCancellationRequested) { diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs index ae1dfd19ca..e2ed03d89c 100644 --- a/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs +++ b/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs @@ -235,7 +235,7 @@ namespace Microsoft.AspNet.TestHost // Assert var buffer = new byte[1]; - for (int i = 0; i < hello.Length; i++) + for (var i = 0; i < hello.Length; i++) { bool last = i == (hello.Length - 1); var result = await clientSocket.ReceiveAsync(new System.ArraySegment(buffer), CancellationToken.None);