Skip to content

Commit 079245b

Browse files
Use interpolated strings in place of StringBuilder.AppendFormat where possible. (#62160)
1 parent 699b0ae commit 079245b

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

src/coreclr/ToolBox/SOS/DacTableGen/diautil.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ private String GetTypeString(IDiaSymbol s)
619619
else if (tag == SymTagEnum.SymTagBaseType)
620620
{
621621
BasicType bt = (BasicType) s.baseType;
622-
str.AppendFormat("(base type={0}, len={1:d})", bt.ToString(), s.length);
622+
str.Append($"(base type={bt}, len={s.length:d})");
623623
}
624624
else if (tag == SymTagEnum.SymTagArrayType)
625625
{
@@ -677,7 +677,7 @@ private String GetTypeString(IDiaSymbol s)
677677
try
678678
{
679679
succ = true;
680-
str.AppendFormat("[{0:d}]", s.length/s.type.length );
680+
str.Append($"[{s.length/s.type.length:d}]");
681681
}
682682
catch (Exception)
683683
{

src/coreclr/tools/Common/TypeSystem/IL/ILDisassembler.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ private unsafe double ReadILDouble()
227227

228228
public static void AppendOffset(StringBuilder sb, int offset)
229229
{
230-
sb.Append("IL_");
231-
sb.AppendFormat("{0:X4}", offset);
230+
sb.Append($"IL_{offset:X4}");
232231
}
233232

234233
private static void PadForInstructionArgument(StringBuilder sb)

src/coreclr/tools/r2rdump/CoreDisTools.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -396,17 +396,17 @@ private void ProbeX64Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffset,
396396
{
397397
if (targetName != null)
398398
{
399-
translated.AppendFormat("[{0}]", targetName);
399+
translated.Append($"[{targetName}]");
400400
}
401401
else
402402
{
403-
translated.AppendFormat("[0x{0:x4}]", target);
403+
translated.Append($"[0x{target:x4}]");
404404
}
405405
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
406406
}
407407
else
408408
{
409-
translated.AppendFormat("[0x{0:x4}]", target);
409+
translated.Append($"[0x{target:x4}]");
410410
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
411411
if (targetName != null)
412412
{
@@ -449,17 +449,17 @@ private void ProbeX86Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffset,
449449
{
450450
if (targetName != null)
451451
{
452-
translated.AppendFormat("[{0}]", targetName);
452+
translated.Append($"[{targetName}]");
453453
}
454454
else
455455
{
456-
translated.AppendFormat("[0x{0:x4}]", target);
456+
translated.Append($"[0x{target:x4}]");
457457
}
458458
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
459459
}
460460
else
461461
{
462-
translated.AppendFormat("[0x{0:x4}]", target);
462+
translated.Append($"[0x{target:x4}]");
463463
translated.Append(instruction, rightBracketPlusOne, instruction.Length - rightBracketPlusOne);
464464
if (targetName != null)
465465
{
@@ -818,7 +818,7 @@ private void ProbeArm64Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffse
818818
}
819819
else
820820
{
821-
translated.AppendFormat("#0x{0:x4}", targetPage);
821+
translated.Append($"#0x{targetPage:x4}");
822822
}
823823

824824
instruction = translated.ToString();
@@ -843,7 +843,7 @@ private void ProbeArm64Quirks(RuntimeFunction rtf, int imageOffset, int rtfOffse
843843
}
844844
else
845845
{
846-
translated.AppendFormat("#0x{0:x}", target & 0xfff);
846+
translated.Append($"#0x{target & 0xfff:x}");
847847
if (targetName != null)
848848
{
849849
AppendComment(translated, "import{" + targetName + "}");

src/coreclr/tools/r2rdump/R2RDiff.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,23 +281,23 @@ private void ShowDiff(Dictionary<string, int> leftObjects, Dictionary<string, in
281281
StringBuilder line = new StringBuilder();
282282
if (inLeft)
283283
{
284-
line.AppendFormat("{0,10}", leftSize);
284+
line.Append($"{leftSize,10}");
285285
}
286286
else
287287
{
288288
line.Append(' ', 10);
289289
}
290290
if (inRight)
291291
{
292-
line.AppendFormat("{0,11}", rightSize);
292+
line.Append($"{rightSize,11}");
293293
}
294294
else
295295
{
296296
line.Append(' ', 11);
297297
}
298298
if (leftSize != rightSize)
299299
{
300-
line.AppendFormat("{0,11}", rightSize - leftSize);
300+
line.Append($"{rightSize - leftSize,11}");
301301
}
302302
else
303303
{

0 commit comments

Comments
 (0)