huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use optimal StringComparison for symbol strings

This commit is contained in:
Bruce Bowyer-Smyth 2015-01-01 15:39:48 +10:00 committed by Doug Bunting
parent f649fb45c8
commit 95ae4cb3a5
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
View File

@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
return right;
}
if (left.EndsWith("/", StringComparison.OrdinalIgnoreCase))
if (left.EndsWith("/", StringComparison.Ordinal))
{
return left + right;
}
@ -136,16 +136,16 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
private static bool IsOverridePattern(string template)
{
return template != null &&
(template.StartsWith("~/", StringComparison.OrdinalIgnoreCase) ||
template.StartsWith("/", StringComparison.OrdinalIgnoreCase));
(template.StartsWith("~/", StringComparison.Ordinal) ||
template.StartsWith("/", StringComparison.Ordinal));
}
private static bool IsEmptyLeftSegment(string template)
{
return template == null ||
template.Equals(string.Empty, StringComparison.OrdinalIgnoreCase) ||
template.Equals("~/", StringComparison.OrdinalIgnoreCase) ||
template.Equals("/", StringComparison.OrdinalIgnoreCase);
template.Equals(string.Empty, StringComparison.Ordinal) ||
template.Equals("~/", StringComparison.Ordinal) ||
template.Equals("/", StringComparison.Ordinal);
}
private static string CleanTemplate(string result)
@ -158,17 +158,17 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
// This is an invalid combined template, so we don't want to
// accidentally clean it and produce a valid template. For that
// reason we ignore the clean up process for it.
if (result.Equals("//", StringComparison.OrdinalIgnoreCase))
if (result.Equals("//", StringComparison.Ordinal))
{
return result;
}
var startIndex = 0;
if (result.StartsWith("/", StringComparison.OrdinalIgnoreCase))
if (result.StartsWith("/", StringComparison.Ordinal))
{
startIndex = 1;
}
else if (result.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
else if (result.StartsWith("~/", StringComparison.Ordinal))
{
startIndex = 2;
}
@ -180,7 +180,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels
}
var subStringLength = result.Length - startIndex;
if (result.EndsWith("/", StringComparison.OrdinalIgnoreCase))
if (result.EndsWith("/", StringComparison.Ordinal))
{
subStringLength--;
}

2
src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs
View File

@ -222,7 +222,7 @@ namespace Microsoft.AspNet.Mvc
supportedEncoding =>
charset.Equals(supportedEncoding.WebName,
StringComparison.OrdinalIgnoreCase) ||
charset.Equals("*", StringComparison.OrdinalIgnoreCase));
charset.Equals("*", StringComparison.Ordinal));
if (encoding != null)
{
return encoding;

4
src/Microsoft.AspNet.Mvc.Core/Formatters/StringWithQualityHeaderValueComparer.cs
View File

@ -56,11 +56,11 @@ namespace Microsoft.AspNet.Mvc
if (!String.Equals(stringWithQuality1.Value, stringWithQuality2.Value, StringComparison.OrdinalIgnoreCase))
{
if (String.Equals(stringWithQuality1.Value, "*", StringComparison.OrdinalIgnoreCase))
if (String.Equals(stringWithQuality1.Value, "*", StringComparison.Ordinal))
{
return -1;
}
else if (String.Equals(stringWithQuality2.Value, "*", StringComparison.OrdinalIgnoreCase))
else if (String.Equals(stringWithQuality2.Value, "*", StringComparison.Ordinal))
{
return 1;
}

2
src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs
View File

@ -82,7 +82,7 @@ namespace Microsoft.AspNet.Mvc
};
Debug.Assert(!string.IsNullOrEmpty(candidate.FullName));
var separatorIndex = candidate.FullName.LastIndexOf(".");
var separatorIndex = candidate.FullName.LastIndexOf('.');
if (separatorIndex >= 0)
{
candidate.ShortName = candidate.FullName.Substring(separatorIndex + 1);

2
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
View File

@ -273,7 +273,7 @@ namespace System.Net.Http.Formatting
Encoding encoding = supportedEncodings[i];
if (encoding != null && acceptCharset.Quality != FormattingUtilities.NoMatch &&
(acceptCharset.Value.Equals(encoding.WebName, StringComparison.OrdinalIgnoreCase) ||
acceptCharset.Value.Equals("*", StringComparison.OrdinalIgnoreCase)))
acceptCharset.Value.Equals("*", StringComparison.Ordinal)))
{
return encoding;
}

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
View File

@ -60,11 +60,11 @@ namespace System.Net.Http.Formatting
if (!String.Equals(stringWithQuality1.Value, stringWithQuality2.Value, StringComparison.OrdinalIgnoreCase))
{
if (String.Equals(stringWithQuality1.Value, "*", StringComparison.OrdinalIgnoreCase))
if (String.Equals(stringWithQuality1.Value, "*", StringComparison.Ordinal))
{
return -1;
}
else if (String.Equals(stringWithQuality2.Value, "*", StringComparison.OrdinalIgnoreCase))
else if (String.Equals(stringWithQuality2.Value, "*", StringComparison.Ordinal))
{
return 1;
}