Nullable: make Object.ToString() return nullable (dotnet/coreclr#23510)

Signed-off-by: dotnet-bot <[email protected]>
dotnet · Apr 10, 2019 · df74dce · df74dce
1 parent 1e0a366
commit df74dce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Globalization/HijriCalendar.Win32.cs b/src/System.Private.CoreLib/shared/System/Globalization/HijriCalendar.Win32.cs
@@ -55,10 +55,10 @@ private static int GetAdvanceHijriDate()
                 }
 
                 int hijriAdvance = 0;
-                string str = value.ToString();
+                string? str = value.ToString();
                 if (string.Compare(str, 0, HijriAdvanceRegKeyEntry, 0, HijriAdvanceRegKeyEntry.Length, StringComparison.OrdinalIgnoreCase) == 0)
                 {
-                    if (str.Length == HijriAdvanceRegKeyEntry.Length)
+                    if (str!.Length == HijriAdvanceRegKeyEntry.Length)
                         hijriAdvance = -1;
                     else
                     {

diff --git a/src/System.Private.CoreLib/shared/System/Object.cs b/src/System.Private.CoreLib/shared/System/Object.cs
@@ -36,7 +36,7 @@ public Object()
 
         // Returns a String which represents the object instance.  The default
         // for an object is to return the fully qualified name of the class.
-        public virtual string ToString()
+        public virtual string? ToString()
         {
             return GetType().ToString();
         }

diff --git a/src/System.Private.CoreLib/shared/System/String.Manipulation.cs b/src/System.Private.CoreLib/shared/System/String.Manipulation.cs
@@ -34,14 +34,7 @@ private static unsafe void FillStringChecked(string dest, int destPos, string sr
             }
         }
 
-        public static string Concat(object? arg0)
-        {
-            if (arg0 == null)
-            {
-                return string.Empty;
-            }
-            return arg0.ToString();
-        }
+        public static string Concat(object? arg0) => arg0?.ToString() ?? string.Empty;
 
         public static string Concat(object? arg0, object? arg1)
         {