Use interpolated strings in more places

dotnet · Jul 13, 2021 · 91f39e2 · 91f39e2
1 parent efef40f
commit 91f39e2
Show file tree

Hide file tree

Showing 254 changed files with 668 additions and 976 deletions.
diff --git a/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.ParseMapModules.cs b/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.ParseMapModules.cs
@@ -15,8 +15,7 @@ internal static partial class procfs
     {
         private const string MapsFileName = "/maps";
 
-        private static string GetMapsFilePathForProcess(int pid) =>
-            RootPath + pid.ToString(CultureInfo.InvariantCulture) + MapsFileName;
+        private static string GetMapsFilePathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{MapsFileName}");
 
         internal static ProcessModuleCollection? ParseMapsModules(int pid)
         {

diff --git a/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.TryReadStatusFile.cs b/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.TryReadStatusFile.cs
@@ -30,10 +30,7 @@ internal struct ParsedStatus
             internal ulong VmPeak;
         }
 
-        internal static string GetStatusFilePathForProcess(int pid)
-        {
-            return RootPath + pid.ToString(CultureInfo.InvariantCulture) + StatusFileName;
-        }
+        internal static string GetStatusFilePathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{StatusFileName}");
 
         internal static bool TryReadStatusFile(int pid, out ParsedStatus result)
         {

diff --git a/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs b/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs
@@ -76,41 +76,17 @@ internal struct ParsedStat
             //internal long cguest_time;
         }
 
-        internal static string GetExeFilePathForProcess(int pid)
-        {
-            return RootPath + pid.ToString(CultureInfo.InvariantCulture) + ExeFileName;
-        }
+        internal static string GetExeFilePathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{ExeFileName}");
 
-        internal static string GetCmdLinePathForProcess(int pid)
-        {
-            return RootPath + pid.ToString(CultureInfo.InvariantCulture) + CmdLineFileName;
-        }
+        internal static string GetCmdLinePathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{CmdLineFileName}");
 
-        internal static string GetStatFilePathForProcess(int pid)
-        {
-            return RootPath + pid.ToString(CultureInfo.InvariantCulture) + StatFileName;
-        }
+        internal static string GetStatFilePathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{StatFileName}");
 
-        internal static string GetTaskDirectoryPathForProcess(int pid)
-        {
-            return RootPath + pid.ToString(CultureInfo.InvariantCulture) + TaskDirectoryName;
-        }
+        internal static string GetTaskDirectoryPathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{TaskDirectoryName}");
 
-        internal static string GetFileDescriptorDirectoryPathForProcess(int pid)
-        {
-            return RootPath + pid.ToString(CultureInfo.InvariantCulture) + FileDescriptorDirectoryName;
-        }
+        internal static string GetFileDescriptorDirectoryPathForProcess(int pid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{FileDescriptorDirectoryName}");
 
-        private static string GetStatFilePathForThread(int pid, int tid)
-        {
-            // Perf note: Calling GetTaskDirectoryPathForProcess will allocate a string,
-            // which we then use in another Concat call to produce another string.  The straightforward alternative,
-            // though, since we have five input strings, is to use the string.Concat overload that takes a params array.
-            // This results in allocating not only the params array but also a defensive copy inside of Concat,
-            // which means allocating two five-element arrays.  This two-string approach will result not only in fewer
-            // allocations, but also typically in less memory allocated, and it's a bit more maintainable.
-            return GetTaskDirectoryPathForProcess(pid) + tid.ToString(CultureInfo.InvariantCulture) + StatFileName;
-        }
+        private static string GetStatFilePathForThread(int pid, int tid) => string.Create(null, stackalloc char[256], $"{RootPath}{(uint)pid}{TaskDirectoryName}{(uint)tid}{StatFileName}");
 
         internal static bool TryReadStatFile(int pid, out ParsedStat result)
         {

diff --git a/src/libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs b/src/libraries/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs
@@ -19,7 +19,7 @@ internal struct GssBuffer : IDisposable
             internal int Copy(byte[] destination, int offset)
             {
                 Debug.Assert(destination != null, "target destination cannot be null");
-                Debug.Assert((offset >= 0 && offset < destination.Length) || destination.Length == 0, "invalid offset " + offset);
+                Debug.Assert((offset >= 0 && offset < destination.Length) || destination.Length == 0, $"invalid offset {offset}");
 
                 if (_data == IntPtr.Zero || _length == 0)
                 {

diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
@@ -295,7 +295,7 @@ internal static int Encrypt(SafeSslHandle context, ReadOnlySpan<byte> input, ref
         {
 #if DEBUG
             ulong assertNoError = Crypto.ErrPeekError();
-            Debug.Assert(assertNoError == 0, "OpenSsl error queue is not empty, run: 'openssl errstr " + assertNoError.ToString("X") + "' for original error.");
+            Debug.Assert(assertNoError == 0, $"OpenSsl error queue is not empty, run: 'openssl errstr {assertNoError:X}' for original error.");
 #endif
             errorCode = Ssl.SslErrorCode.SSL_ERROR_NONE;
 
@@ -349,7 +349,7 @@ internal static int Decrypt(SafeSslHandle context, Span<byte> buffer, out Ssl.Ss
         {
 #if DEBUG
             ulong assertNoError = Crypto.ErrPeekError();
-            Debug.Assert(assertNoError == 0, "OpenSsl error queue is not empty, run: 'openssl errstr " + assertNoError.ToString("X") + "' for original error.");
+            Debug.Assert(assertNoError == 0, $"OpenSsl error queue is not empty, run: 'openssl errstr {assertNoError:X}' for original error.");
 #endif
             errorCode = Ssl.SslErrorCode.SSL_ERROR_NONE;
 

diff --git a/src/libraries/Common/src/Interop/Windows/SspiCli/SecurityPackageInfoClass.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecurityPackageInfoClass.cs
@@ -59,14 +59,7 @@ internal unsafe SecurityPackageInfoClass(SafeHandle safeHandle, int index)
             if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this, this.ToString());
         }
 
-        public override string ToString()
-        {
-            return "Capabilities:" + string.Format(CultureInfo.InvariantCulture, "0x{0:x}", Capabilities)
-                + " Version:" + Version.ToString(NumberFormatInfo.InvariantInfo)
-                + " RPCID:" + RPCID.ToString(NumberFormatInfo.InvariantInfo)
-                + " MaxToken:" + MaxToken.ToString(NumberFormatInfo.InvariantInfo)
-                + " Name:" + ((Name == null) ? "(null)" : Name)
-                + " Comment:" + ((Comment == null) ? "(null)" : Comment);
-        }
+        public override string ToString() =>
+            $"Capabilities:0x{Capabilities:x} Version:{Version} RPCID:{RPCID} MaxToken:{MaxToken} Name:{Name ?? "(null)"} Comment: {Comment ?? "(null)"}";
     }
 }
diff --git a/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs b/src/libraries/Common/src/System/CodeDom/CodeTypeReference.cs
@@ -327,7 +327,7 @@ public string BaseType
 
                 string returnType = _baseType;
                 return _needsFixup && TypeArguments.Count > 0 ?
-                    returnType + '`' + TypeArguments.Count.ToString(CultureInfo.InvariantCulture) :
+                    $"{returnType}`{(uint)TypeArguments.Count}" :
                     returnType;
             }
             set

diff --git a/src/libraries/Common/src/System/Composition/Diagnostics/DebuggerTraceWriter.cs b/src/libraries/Common/src/System/Composition/Diagnostics/DebuggerTraceWriter.cs
@@ -57,8 +57,7 @@ private static string CreateLogMessage(TraceEventType eventType, CompositionTrac
             StringBuilder messageBuilder = new StringBuilder();
 
             // Format taken from TraceListener.TraceEvent in .NET Framework
-            messageBuilder.AppendFormat(CultureInfo.InvariantCulture, "{0} {1}: {2} : ",
-                s_sourceName, eventType.ToString(), (int)traceId);
+            messageBuilder.Append($"{s_sourceName} {eventType}: {(int)traceId} : ");
 
             if (arguments == null)
             {

diff --git a/src/libraries/Common/src/System/Data/Common/DbConnectionOptions.Common.cs b/src/libraries/Common/src/System/Data/Common/DbConnectionOptions.Common.cs
@@ -525,11 +525,11 @@ private static void ParseComparison(Dictionary<string, string?> parsetable, stri
                             }
                         }
                     }
-                    Debug.Assert(isEquivalent, "ParseInternal code vs regex message mismatch: <" + msg1 + "> <" + msg2 + ">");
+                    Debug.Assert(isEquivalent, $"ParseInternal code vs regex message mismatch: <{msg1}> <{msg2}>");
                 }
                 else
                 {
-                    Debug.Fail("ParseInternal code vs regex throw mismatch " + f.Message);
+                    Debug.Fail($"ParseInternal code vs regex throw mismatch {f.Message}");
                 }
                 e = null;
             }

diff --git a/src/libraries/Common/src/System/Drawing/ColorTranslator.cs b/src/libraries/Common/src/System/Drawing/ColorTranslator.cs
@@ -386,9 +386,7 @@ public static string ToHtml(Color c)
             }
             else
             {
-                colorString = "#" + c.R.ToString("X2", null) +
-                                    c.G.ToString("X2", null) +
-                                    c.B.ToString("X2", null);
+                colorString = $"#{c.R:X2}{c.G:X2}{c.B:X2}";
             }
 
             return colorString;

diff --git a/src/libraries/Common/src/System/IO/RowConfigReader.cs b/src/libraries/Common/src/System/IO/RowConfigReader.cs
@@ -132,7 +132,7 @@ private bool TryFindNextKeyOccurrence(string key, int startIndex, out int keyInd
                 }
                 // Check If the match is at the beginning of the string, or is preceded by a newline.
                 else if (keyIndex == 0
-                    || (keyIndex >= Environment.NewLine.Length && _buffer.Substring(keyIndex - Environment.NewLine.Length, Environment.NewLine.Length) == Environment.NewLine))
+                    || (keyIndex >= Environment.NewLine.Length && _buffer.AsSpan(keyIndex - Environment.NewLine.Length, Environment.NewLine.Length).SequenceEqual(Environment.NewLine)))
                 {
                     // Check if the match is followed by whitespace, meaning it is not part of a larger word.
                     if (HasFollowingWhitespace(keyIndex, key.Length))

diff --git a/src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs b/src/libraries/Common/src/System/Net/Security/NegotiateStreamPal.Windows.cs
@@ -212,7 +212,7 @@ internal static int VerifySignature(SafeDeleteContext securityContext, byte[] bu
             // throw if error
             if (errorCode != 0)
             {
-                NetEventSource.Info($"VerifySignature threw error: {errorCode.ToString("x", NumberFormatInfo.InvariantInfo)}");
+                NetEventSource.Info($"VerifySignature threw error: {errorCode:x}");
                 throw new Win32Exception(errorCode);
             }
 
@@ -256,7 +256,7 @@ internal static int MakeSignature(SafeDeleteContext securityContext, byte[] buff
             // throw if error
             if (errorCode != 0)
             {
-                NetEventSource.Info($"MakeSignature threw error: {errorCode.ToString("x", NumberFormatInfo.InvariantInfo)}");
+                NetEventSource.Info($"MakeSignature threw error: {errorCode:x}");
                 throw new Win32Exception(errorCode);
             }
 

diff --git a/src/libraries/Common/tests/StaticTestGenerator/Program.cs b/src/libraries/Common/tests/StaticTestGenerator/Program.cs
@@ -710,12 +710,12 @@ private static string EncodeLiteral(object? literal, Type? expectedType)
 
             if (literal is IntPtr ptr)
             {
-                return $"new IntPtr(0x{((long)ptr).ToString("X")})";
+                return $"new IntPtr(0x{(long)ptr:X})";
             }
 
             if (literal is UIntPtr uptr)
             {
-                return $"new UIntPtr(0x{((ulong)uptr).ToString("X")})";
+                return $"new UIntPtr(0x{(ulong)uptr:X})";
             }
 
             string? result = null;
@@ -732,34 +732,34 @@ private static string EncodeLiteral(object? literal, Type? expectedType)
                         result = ((bool)literal).ToString().ToLowerInvariant();
                         break;
                     case TypeCode.Char:
-                        result = $"'\\u{((int)(char)literal).ToString("X4")}'";
+                        result = $"'\\u{(int)(char)literal:X4}'";
                         break;
                     case TypeCode.SByte:
-                        result = $"(sbyte)({literal.ToString()})";
+                        result = $"(sbyte)({literal})";
                         break;
                     case TypeCode.Byte:
-                        result = $"(byte){literal.ToString()}";
+                        result = $"(byte){literal}";
                         break;
                     case TypeCode.Int16:
-                        result = $"(short)({literal.ToString()})";
+                        result = $"(short)({literal})";
                         break;
                     case TypeCode.UInt16:
-                        result = $"(ushort){literal.ToString()}";
+                        result = $"(ushort){literal}";
                         break;
                     case TypeCode.Int32:
-                        result = $"({literal.ToString()})";
+                        result = $"({literal})";
                         break;
                     case TypeCode.UInt32:
-                        result = $"{literal.ToString()}U";
+                        result = $"{literal}U";
                         break;
                     case TypeCode.Int64:
-                        result = $"({literal.ToString()}L)";
+                        result = $"({literal}L)";
                         break;
                     case TypeCode.UInt64:
-                        result = $"{literal.ToString()}UL";
+                        result = $"{literal}UL";
                         break;
                     case TypeCode.Decimal:
-                        result = $"({literal.ToString()}M)";
+                        result = $"({literal}M)";
                         break;
                     case TypeCode.Single:
                         result =

diff --git a/src/libraries/Common/tests/System/Net/Http/HttpProtocolTests.cs b/src/libraries/Common/tests/System/Net/Http/HttpProtocolTests.cs
@@ -447,7 +447,7 @@ await server.AcceptConnectionAsync(async connection =>
                     {
                         int bytesRemaining = expectedData.Length - bytesSent;
                         int bytesToSend = rand.Next(1, Math.Min(bytesRemaining, maxChunkSize + 1));
-                        await connection.WriteStringAsync(bytesToSend.ToString("X") + lineEnding);
+                        await connection.WriteStringAsync($"{bytesToSend:X}{lineEnding}");
                         await connection.Stream.WriteAsync(new Memory<byte>(expectedData, bytesSent, bytesToSend));
                         await connection.WriteStringAsync(lineEnding);
                         bytesSent += bytesToSend;

diff --git a/src/libraries/Common/tests/System/Security/Cryptography/ByteUtils.cs b/src/libraries/Common/tests/System/Security/Cryptography/ByteUtils.cs
@@ -55,7 +55,7 @@ internal static string ByteArrayToHex(this ReadOnlySpan<byte> bytes)
 
             for (int i = 0; i < bytes.Length; i++)
             {
-                builder.Append(bytes[i].ToString("X2"));
+                builder.Append($"{bytes[i]:X2}");
             }
 
             return builder.ToString();

diff --git a/src/libraries/Common/tests/System/Xml/XmlCoreTest/ManagedNodeWriter.cs b/src/libraries/Common/tests/System/Xml/XmlCoreTest/ManagedNodeWriter.cs
@@ -109,14 +109,14 @@ public void WriteDocType(string name, string sysid, string pubid, string subset)
             if (pubid == null)
             {
                 if (sysid != null)
-                    dt.Append(" SYSTEM " + sysid);
+                    dt.Append($" SYSTEM {sysid}");
             }
             else
             {
-                dt.Append(" PUBLIC " + pubid);
+                dt.Append($" PUBLIC {pubid}");
                 if (sysid != null)
                 {
-                    dt.Append(" " + sysid);
+                    dt.Append($" {sysid}");
                 }
             }
 
@@ -298,23 +298,23 @@ public void PutByte()
         /// </summary>
         public void PutCData()
         {
-            _q.Append("<![CDATA[" + CDATA + _cCount++ + "]]>");
+            _q.Append($"<![CDATA[{CDATA}{_cCount++}]]>");
         }
 
         /// <summary>
         /// Writes out a PI Node.
         /// </summary>
         public void PutPI()
         {
-            _q.Append("<?" + PI + _pCount++ + "?>");
+            _q.Append($"<?{PI}{_pCount++}?>");
         }
 
         /// <summary>
         /// Writes out a Comment Node.
         /// </summary>
         public void PutComment()
         {
-            _q.Append("<!--" + COMMENT + _mCount++ + " -->");
+            _q.Append($"<!--{COMMENT}{_mCount++} -->");
         }
 
         /// <summary>

diff --git a/src/libraries/Common/tests/System/Xml/XmlDiff/XmlDiffDocument.cs b/src/libraries/Common/tests/System/Xml/XmlDiff/XmlDiffDocument.cs
@@ -1594,7 +1594,7 @@ public override void WriteTo(XmlWriter w)
                     w.WriteString(Value);
                     break;
                 default:
-                    Debug.Assert(false, "Wrong type for text-like node : " + this._nodetype.ToString());
+                    Debug.Assert(false, $"Wrong type for text-like node : {this._nodetype}");
                     break;
             }
         }

diff --git a/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/ParsedUnicodeData.cs b/src/libraries/Common/tests/TestUtilities.Unicode/System/Text/Unicode/ParsedUnicodeData.cs
@@ -151,7 +151,7 @@ private static Dictionary<int, string> ProcessDerivedNameFile()
                         string baseName = value.PropName[..^1];
                         for (int i = value.FirstCodePoint; i <= value.LastCodePoint /* inclusive */; i++)
                         {
-                            dict.Add(i, baseName + i.ToString("X4", CultureInfo.InvariantCulture));
+                            dict.Add(i, $"{baseName}{i:X4}");
                         }
                     }
                 }

diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -247,6 +247,7 @@
     <Reference Include="System.Diagnostics.Tools" />
     <Reference Include="System.Linq" />
     <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Memory" />
     <Reference Include="System.ObjectModel" />
     <Reference Include="System.Reflection" />
     <Reference Include="System.Resources.ResourceManager" />

diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/VariantArray.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/VariantArray.cs
@@ -82,7 +82,7 @@ internal static Type GetStructType(int args)
                 // See if we can find an existing type
                 foreach (Type t in s_generatedTypes)
                 {
-                    int arity = int.Parse(t.Name.Substring("VariantArray".Length), CultureInfo.InvariantCulture);
+                    int arity = int.Parse(t.Name.AsSpan("VariantArray".Length), provider: CultureInfo.InvariantCulture);
                     if (size == arity)
                     {
                         return t;

diff --git a/src/libraries/Microsoft.Win32.Primitives/src/System/ComponentModel/Win32Exception.cs b/src/libraries/Microsoft.Win32.Primitives/src/System/ComponentModel/Win32Exception.cs
@@ -91,11 +91,11 @@ public override string ToString()
                 : NativeErrorCode.ToString(CultureInfo.InvariantCulture);
             if (HResult == E_FAIL)
             {
-                s.AppendFormat(CultureInfo.InvariantCulture, " ({0})", nativeErrorString);
+                s.AppendFormat($" ({nativeErrorString})");
             }
             else
             {
-                s.AppendFormat(CultureInfo.InvariantCulture, " ({0:X8}, {1})", HResult, nativeErrorString);
+                s.AppendFormat($" ({HResult:X8}, {nativeErrorString})");
             }
 
             if (!(string.IsNullOrEmpty(message)))

diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryKey.Windows.cs b/src/libraries/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryKey.Windows.cs
@@ -173,7 +173,7 @@ private void DeleteValueCore(string name, bool throwOnMissingValue)
             }
             // We really should throw an exception here if errorCode was bad,
             // but we can't for compatibility reasons.
-            Debug.Assert(errorCode == 0, "RegDeleteValue failed.  Here's your error code: " + errorCode);
+            Debug.Assert(errorCode == 0, $"RegDeleteValue failed.  Here's your error code: {errorCode}");
         }
 
         /// <summary>

diff --git a/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/CSharp/CSharpCodeGenerator.cs
@@ -793,12 +793,12 @@ private void AppendEscapedChar(StringBuilder b, char value)
             if (b == null)
             {
                 Output.Write("\\u");
-                Output.Write(((int)value).ToString("X4", CultureInfo.InvariantCulture));
+                Output.Write(((int)value).ToString("X4"));
             }
             else
             {
                 b.Append("\\u");
-                b.Append(((int)value).ToString("X4", CultureInfo.InvariantCulture));
+                b.Append(((int)value).ToString("X4"));
             }
         }
 
@@ -2501,7 +2501,7 @@ private void GenerateChecksumPragma(CodeChecksumPragma checksumPragma)
             {
                 foreach (byte b in checksumPragma.ChecksumData)
                 {
-                    Output.Write(b.ToString("X2", CultureInfo.InvariantCulture));
+                    Output.Write(b.ToString("X2"));
                 }
             }
             Output.WriteLine("\"");

diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs
@@ -2273,7 +2273,7 @@ private void GenerateChecksumPragma(CodeChecksumPragma checksumPragma)
             {
                 foreach (byte b in checksumPragma.ChecksumData)
                 {
-                    Output.Write(b.ToString("X2", CultureInfo.InvariantCulture));
+                    Output.Write(b.ToString("X2"));
                 }
             }
             Output.WriteLine("\")");