Skip to content

Use interpolated strings in place of StringBuilder.AppendFormat where possible. #62160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marek-safar merged 5 commits into from
Jan 3, 2022
Merged

Use interpolated strings in place of StringBuilder.AppendFormat where possible. #62160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66ca27a
Use interpolated strings in place of `StringBuilder.AppendFormat` whe…
teo-tsirpanis Nov 29, 2021
a3d5976
Address PR feedback; revert some of the optimizations.
teo-tsirpanis Nov 30, 2021
20f3b3b
Complete reverting changes to System.Speech.
teo-tsirpanis Nov 30, 2021
d23709c
Revert changes in DependencyInjection.
teo-tsirpanis Nov 30, 2021
572181e
Revert all changes in SignedXmlDebugLog.
teo-tsirpanis Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/ToolBox/SOS/DacTableGen/diautil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ private String GetTypeString(IDiaSymbol s)
else if (tag == SymTagEnum.SymTagBaseType)
{
BasicType bt = (BasicType) s.baseType;
str.AppendFormat("(base type={0}, len={1:d})", bt.ToString(), s.length);
str.Append($"(base type={bt}, len={s.length:d})");
}
else if (tag == SymTagEnum.SymTagArrayType)
{
Expand Down Expand Up @@ -677,7 +677,7 @@ private String GetTypeString(IDiaSymbol s)
try
{
succ = true;
str.AppendFormat("[{0:d}]", s.length/s.type.length );
str.Append($"[{s.length/s.type.length:d}]");
}
catch (Exception)
{
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/tools/Common/TypeSystem/IL/ILDisassembler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,7 @@ private unsafe double ReadILDouble()

public static void AppendOffset(StringBuilder sb, int offset)
{
sb.Append("IL_");
sb.AppendFormat("{0:X4}", offset);
sb.Append($"IL_{offset:X4}");
}

private static void PadForInstructionArgument(StringBuilder sb)
Expand Down
16 changes: 8 additions & 8 deletions src/coreclr/tools/r2rdump/CoreDisTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,17 +396,17 @@ private void ProbeX64Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffset,
{
if (targetName != null)
{
translated.AppendFormat("[{0}]", targetName);
translated.Append($"[{targetName}]");
}
else
{
translated.AppendFormat("[0x{0:x4}]", target);
translated.Append($"[0x{target:x4}]");
}
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
}
else
{
translated.AppendFormat("[0x{0:x4}]", target);
translated.Append($"[0x{target:x4}]");
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
if (targetName != null)
{
Expand Down Expand Up @@ -449,17 +449,17 @@ private void ProbeX86Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffset,
{
if (targetName != null)
{
translated.AppendFormat("[{0}]", targetName);
translated.Append($"[{targetName}]");
}
else
{
translated.AppendFormat("[0x{0:x4}]", target);
translated.Append($"[0x{target:x4}]");
}
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
}
else
{
translated.AppendFormat("[0x{0:x4}]", target);
translated.Append($"[0x{target:x4}]");
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
if (targetName != null)
{
Expand Down Expand Up @@ -818,7 +818,7 @@ private void ProbeArm64Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffse
}
else
{
translated.AppendFormat("#0x{0:x4}", targetPage);
translated.Append($"#0x{targetPage:x4}");
}

instruction = translated.ToString();
Expand All @@ -843,7 +843,7 @@ private void ProbeArm64Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffse
}
else
{
translated.AppendFormat("#0x{0:x}", target & 0xfff);
translated.Append($"#0x{target & 0xfff:x}");
if (targetName != null)
{
AppendComment(translated, "import{" + targetName + "}");
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/tools/r2rdump/R2RDiff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,23 +281,23 @@ private void ShowDiff(Dictionary<string, int> leftObjects, Dictionary<string, in
StringBuilder line = new StringBuilder();
if (inLeft)
{
line.AppendFormat("{0,10}", leftSize);
line.Append($"{leftSize,10}");
}
else
{
line.Append(' ', 10);
}
if (inRight)
{
line.AppendFormat("{0,11}", rightSize);
line.Append($"{rightSize,11}");
}
else
{
line.Append(' ', 11);
}
if (leftSize != rightSize)
{
line.AppendFormat("{0,11}", rightSize - leftSize);
line.Append($"{rightSize - leftSize,11}");
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.DependencyInjection/src/CallSiteJsonFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public void StartProperty(string name)
{
_firstItem = false;
}
Builder.AppendFormat("\"{0}\":", name);
Builder.Append($"\"{name}\":");
}

public void StartArrayItem()
Expand All @@ -179,7 +179,7 @@ public void WriteProperty(string name, object value)
StartProperty(name);
if (value != null)
{
Builder.AppendFormat(" \"{0}\"", value);
Builder.Append($" \"{value}\"");
}
else
{
Expand Down
4 changes: 1 addition & 3 deletions src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceLookup/CallSiteChain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ private void AppendResolutionPath(StringBuilder builder, Type currentlyResolving
}
else
{
builder.AppendFormat("{0}({1})",
TypeNameHelper.GetTypeDisplayName(serviceType),
TypeNameHelper.GetTypeDisplayName(implementationType));
builder.Append($"{TypeNameHelper.GetTypeDisplayName(serviceType)}({TypeNameHelper.GetTypeDisplayName(implementationType)})");
}

builder.Append(" -> ");
Expand Down
4 changes: 2 additions & 2 deletions .../System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/MetricsEventSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ private string FormatTags(KeyValuePair<string, string>[] labels)
StringBuilder sb = new StringBuilder();
for (int i = 0; i < labels.Length; i++)
{
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}={1}", labels[i].Key, labels[i].Value);
sb.Append(CultureInfo.InvariantCulture, $"{labels[i].Key}={labels[i].Value}");
if (i != labels.Length - 1)
{
sb.Append(',');
Expand All @@ -428,7 +428,7 @@ private string FormatQuantiles(QuantileValue[] quantiles)
StringBuilder sb = new StringBuilder();
for (int i = 0; i < quantiles.Length; i++)
{
sb.AppendFormat(CultureInfo.InvariantCulture, "{0}={1}", quantiles[i].Quantile, quantiles[i].Value);
sb.Append(CultureInfo.InvariantCulture, $"{quantiles[i].Quantile}={quantiles[i].Value}");
if (i != quantiles.Length - 1)
{
sb.Append(';');
Expand Down
8 changes: 4 additions & 4 deletions ...ystem.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/SignedXmlDebugLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ internal static void LogUnsafeCanonicalizationMethod(SignedXml signedXml, string
validAlgorithmBuilder.Append(", ");
}

validAlgorithmBuilder.AppendFormat("\"{0}\"", validAlgorithm);
validAlgorithmBuilder.Append($"\"{validAlgorithm}\"");
}

string logMessage = SR.Format(CultureInfo.InvariantCulture,
Expand Down Expand Up @@ -507,7 +507,7 @@ internal static void LogUnsafeTransformMethod(
validAlgorithmBuilder.Append(", ");
}

validAlgorithmBuilder.AppendFormat("\"{0}\"", validAlgorithm);
validAlgorithmBuilder.Append($"\"{validAlgorithm}\"");
}

foreach (string validAlgorithm in validTransformAlgorithms)
Expand All @@ -517,7 +517,7 @@ internal static void LogUnsafeTransformMethod(
validAlgorithmBuilder.Append(", ");
}

validAlgorithmBuilder.AppendFormat("\"{0}\"", validAlgorithm);
validAlgorithmBuilder.Append($"\"{validAlgorithm}\"");
}

string logMessage = SR.Format(CultureInfo.InvariantCulture,
Expand Down Expand Up @@ -1007,7 +1007,7 @@ internal static void LogVerifyX509Chain(SignedXml signedXml, X509Chain chain, X5

foreach (X509ChainElement element in chain.ChainElements)
{
chainElements.AppendFormat(CultureInfo.InvariantCulture, " {0}", GetKeyName(element.Certificate));
chainElements.Append(CultureInfo.InvariantCulture, $" {GetKeyName(element.Certificate)}");
}

WriteLine(signedXml,
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Speech/src/Internal/Synthesis/TextFragmentEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ public void ProcessUnknownElement(object voice, ref FragmentState fragmentState,
public void StartProcessUnknownAttributes(object voice, ref FragmentState fragmentState, string element, List<SsmlXmlAttribute> extraAttributes)
{
StringBuilder sb = new();
sb.AppendFormat(CultureInfo.InvariantCulture, "<{0}", element);
sb.Append(CultureInfo.InvariantCulture, $"<{element}");
foreach (SsmlXmlAttribute attribute in extraAttributes)
{
sb.AppendFormat(CultureInfo.InvariantCulture, " {0}:{1}=\"{2}\" xmlns:{3}=\"{4}\"", attribute._prefix, attribute._name, attribute._value, attribute._prefix, attribute._ns);
sb.Append(CultureInfo.InvariantCulture, $" {attribute._prefix}:{attribute._name}=\"{attribute._value}\" xmlns:{attribute._prefix}=\"{attribute._ns}\"");
}
sb.Append('>');

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Speech/src/Recognition/SrgsGrammar/SrgsNameValueTag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ internal override void WriteSrgs(XmlWriter writer)
{
if (Value is string)
{
sb.AppendFormat(CultureInfo.InvariantCulture, "\"{0}\"", Value.ToString());
sb.Append(CultureInfo.InvariantCulture, $"\"{Value}\"");
}
else
{
Expand Down Expand Up @@ -143,7 +143,7 @@ internal override string DebuggerDisplayString()
{
if (_value is string)
{
sb.AppendFormat(CultureInfo.InvariantCulture, "\"{0}\"", _value.ToString());
sb.Append(CultureInfo.InvariantCulture, $"\"{_value}\"");
}
else
{
Expand Down