Collapse AsSpan().Slice(...) into .AsSpan(...) (#27867)

Author: tarekgh

src/Common/src/CoreLib/System/Globalization/CompareInfo.cs

@@ -506,8 +506,8 @@ public virtual int Compare(string string1, int offset1, int length1, string stri
             }
 
             return CompareString(
-                string1.AsSpan().Slice(offset1, length1),
-                string2.AsSpan().Slice(offset2, length2),
+                string1.AsSpan(offset1, length1),
+                string2.AsSpan(offset2, length2),
                 options);
         }
 
@@ -531,7 +531,7 @@ internal static int CompareOrdinalIgnoreCase(string strA, int indexA, int length
         {
             Debug.Assert(indexA + lengthA <= strA.Length);
             Debug.Assert(indexB + lengthB <= strB.Length);
-            return CompareOrdinalIgnoreCase(strA.AsSpan().Slice(indexA, lengthA), strB.AsSpan().Slice(indexB, lengthB));
+            return CompareOrdinalIgnoreCase(strA.AsSpan(indexA, lengthA), strB.AsSpan(indexB, lengthB));
         }
 
         internal static unsafe int CompareOrdinalIgnoreCase(ReadOnlySpan<char> strA, ReadOnlySpan<char> strB)

src/Common/src/CoreLib/System/Globalization/DateTimeParse.cs

@@ -331,7 +331,7 @@ internal enum DS
         //
         ////////////////////////////////////////////////////////////////////////////
 
-        //          End       NumEnd      NumAmPm     NumSpace    NumDaySep   NumTimesep  MonthEnd    MonthSpace  MonthDSep   NumDateSuff NumTimeSuff     DayOfWeek     YearSpace   YearDateSep YearEnd     TimeZone   Era         UTCTimeMark   
+        //          End       NumEnd      NumAmPm     NumSpace    NumDaySep   NumTimesep  MonthEnd    MonthSpace  MonthDSep   NumDateSuff NumTimeSuff     DayOfWeek     YearSpace   YearDateSep YearEnd     TimeZone   Era         UTCTimeMark
         private static DS[][] dateParsingStates = {
 // DS.BEGIN                                                                             // DS.BEGIN
 new DS[] { DS.BEGIN, DS.ERROR,   DS.TX_N,    DS.N,       DS.D_Nd,    DS.T_Nt,    DS.ERROR,   DS.D_M,     DS.D_M,     DS.D_S,     DS.T_S,         DS.BEGIN,     DS.D_Y,     DS.D_Y,     DS.ERROR,   DS.BEGIN,  DS.BEGIN,    DS.ERROR},
@@ -713,7 +713,7 @@ private static Boolean Lex(DS dps, ref __DTString str, ref DateTimeToken dtok, r
                                         return false;
                                     }
 
-                                    // we have the date and time separators are same and getting a year number, then change the token to YearDateSep as 
+                                    // we have the date and time separators are same and getting a year number, then change the token to YearDateSep as
                                     // we are sure we are not parsing time.
                                     dtok.dtt = DTT.YearDateSep;
                                     break;
@@ -1002,7 +1002,7 @@ private static Boolean Lex(DS dps, ref __DTString str, ref DateTimeToken dtok, r
                                     return false;
                                 }
 
-                                // we have the date and time separators are same and getting a Month name, then change the token to MonthDatesep as 
+                                // we have the date and time separators are same and getting a Month name, then change the token to MonthDatesep as
                                 // we are sure we are not parsing time.
                                 dtok.dtt = DTT.MonthDatesep;
                                 break;
@@ -1212,7 +1212,7 @@ private static Boolean VerifyValidPunctuation(ref __DTString str)
                     // The has was un-paired
                     return false;
                 }
-                // Valid Hash usage: eat the hash and continue. 
+                // Valid Hash usage: eat the hash and continue.
                 str.GetNext();
                 return true;
             }
@@ -2591,7 +2591,7 @@ internal static bool TryParse(ReadOnlySpan<char> s, DateTimeFormatInfo dtfi, Dat
                     {
                         if (dtok.dtt == DTT.YearEnd || dtok.dtt == DTT.YearSpace || dtok.dtt == DTT.YearDateSep)
                         {
-                            // When time and date separators are same and we are hitting a year number while the first parsed part of the string was recognized 
+                            // When time and date separators are same and we are hitting a year number while the first parsed part of the string was recognized
                             // as part of time (and not a date) DS.T_Nt, DS.T_NNt then change the state to be a date so we try to parse it as a date instead
                             if (dps == DS.T_Nt)
                             {
@@ -2608,7 +2608,7 @@ internal static bool TryParse(ReadOnlySpan<char> s, DateTimeFormatInfo dtfi, Dat
                         {
                             switch (dtok.dtt)
                             {
-                                // we have the case of Serbia have dates in forms 'd.M.yyyy.' so we can expect '.' after the date parts. 
+                                // we have the case of Serbia have dates in forms 'd.M.yyyy.' so we can expect '.' after the date parts.
                                 // changing the token to end with space instead of Date Separator will avoid failing the parsing.
 
                                 case DTT.YearDateSep: dtok.dtt = atEnd ? DTT.YearEnd : DTT.YearSpace; break;
@@ -2734,7 +2734,7 @@ private static Boolean DetermineTimeZoneAdjustments(ref __DTString str, ref Date
         {
             if ((result.flags & ParseFlags.CaptureOffset) != 0)
             {
-                // This is a DateTimeOffset parse, so the offset will actually be captured directly, and 
+                // This is a DateTimeOffset parse, so the offset will actually be captured directly, and
                 // no adjustment is required in most cases
                 return DateTimeOffsetTimeZonePostProcessing(ref str, ref result, styles);
             }
@@ -2810,7 +2810,7 @@ private static Boolean DetermineTimeZoneAdjustments(ref __DTString str, ref Date
         // Apply validation and adjustments specific to DateTimeOffset
         private static Boolean DateTimeOffsetTimeZonePostProcessing(ref __DTString str, ref DateTimeResult result, DateTimeStyles styles)
         {
-            // For DateTimeOffset, default to the Utc or Local offset when an offset was not specified by 
+            // For DateTimeOffset, default to the Utc or Local offset when an offset was not specified by
             // the input string.
             if ((result.flags & ParseFlags.TimeZoneUsed) == 0)
             {
@@ -2833,7 +2833,7 @@ private static Boolean DateTimeOffsetTimeZonePostProcessing(ref __DTString str,
             Int64 utcTicks = result.parsedDate.Ticks - offsetTicks;
 
             // For DateTimeOffset, both the parsed time and the corresponding UTC value must be within the boundaries
-            // of a DateTime instance.            
+            // of a DateTime instance.
             if (utcTicks < DateTime.MinTicks || utcTicks > DateTime.MaxTicks)
             {
                 result.SetFailure(ParseFailureKind.FormatWithOriginalDateTime, nameof(SR.Format_UTCOutOfRange));
@@ -3668,7 +3668,7 @@ private static DateTime GetDateTimeNow(ref DateTimeResult result, ref DateTimeSt
                 }
             }
 
-            // assume the offset is Local            
+            // assume the offset is Local
             return DateTime.Now;
         }
 
@@ -4218,7 +4218,7 @@ private static bool ParseByFormat(
                     }
 
                     // The "r" and "u" formats incorrectly quoted 'GMT' and 'Z', respectively.  We cannot
-                    // correct this mistake for DateTime.ParseExact for compatibility reasons, but we can 
+                    // correct this mistake for DateTime.ParseExact for compatibility reasons, but we can
                     // fix it for DateTimeOffset.ParseExact as DateTimeOffset has not been publically released
                     // with this issue.
                     if ((result.flags & ParseFlags.CaptureOffset) != 0)
@@ -5045,7 +5045,7 @@ internal bool MatchSpecifiedWords(String target, bool checkWordBoundary, ref int
                         {
                             return false;
                         }
-                        if (m_info.CompareOptionIgnoreCase(Value.Slice(thisPosition, segmentLength), target.AsSpan().Slice(targetPosition, segmentLength)) != 0)
+                        if (m_info.CompareOptionIgnoreCase(Value.Slice(thisPosition, segmentLength), target.AsSpan(targetPosition, segmentLength)) != 0)
                         {
                             return false;
                         }
@@ -5071,7 +5071,7 @@ internal bool MatchSpecifiedWords(String target, bool checkWordBoundary, ref int
                     {
                         return false;
                     }
-                    if (m_info.CompareOptionIgnoreCase(Value.Slice(thisPosition, segmentLength), target.AsSpan().Slice(targetPosition, segmentLength)) != 0)
+                    if (m_info.CompareOptionIgnoreCase(Value.Slice(thisPosition, segmentLength), target.AsSpan(targetPosition, segmentLength)) != 0)
                     {
                         return false;
                     }

src/Common/src/CoreLib/System/Globalization/HijriCalendar.Win32.cs

@@ -69,7 +69,7 @@ private static int GetAdvanceHijriDate()
                         {
                             try
                             {
-                                int advance = Int32.Parse(str.AsSpan().Slice(HijriAdvanceRegKeyEntry.Length), provider:CultureInfo.InvariantCulture);
+                                int advance = Int32.Parse(str.AsSpan(HijriAdvanceRegKeyEntry.Length), provider:CultureInfo.InvariantCulture);
                                 if ((advance >= MinAdvancedHijri) && (advance <= MaxAdvancedHijri))
                                 {
                                     hijriAdvance = advance;

src/Common/src/CoreLib/System/IO/Path.Windows.cs

@@ -83,7 +83,7 @@ public static string GetFullPath(string path, string basePath)
                 // Path is current drive rooted i.e. starts with \:
                 // "\Foo" and "C:\Bar" => "C:\Foo"
                 // "\Foo" and "\\?\C:\Bar" => "\\?\C:\Foo"
-                combinedPath = Join(GetPathRoot(basePath.AsSpan()), path.AsSpan().Slice(1)); // Cut the separator to ensure we don't end up with two separators when joining with the root.
+                combinedPath = Join(GetPathRoot(basePath.AsSpan()), path.AsSpan(1)); // Cut the separator to ensure we don't end up with two separators when joining with the root.
             }
             else if (length >= 2 && PathInternal.IsValidDriveChar(path[0]) && path[1] == PathInternal.VolumeSeparatorChar)
             {
@@ -95,7 +95,7 @@ public static string GetFullPath(string path, string basePath)
                     // Matching root
                     // "C:Foo" and "C:\Bar" => "C:\Bar\Foo"
                     // "C:Foo" and "\\?\C:\Bar" => "\\?\C:\Bar\Foo"
-                    combinedPath = Join(basePath, path.AsSpan().Slice(2));
+                    combinedPath = Join(basePath, path.AsSpan(2));
                 }
                 else
                 {
@@ -105,8 +105,8 @@ public static string GetFullPath(string path, string basePath)
                     combinedPath = !PathInternal.IsDevice(basePath)
                         ? path.Insert(2, @"\")
                         : length == 2
-                            ? JoinInternal(basePath.AsSpan().Slice(0, 4), path, @"\")
-                            : JoinInternal(basePath.AsSpan().Slice(0, 4), path.AsSpan().Slice(0, 2), @"\", path.AsSpan().Slice(2));
+                            ? JoinInternal(basePath.AsSpan(0, 4), path, @"\")
+                            : JoinInternal(basePath.AsSpan(0, 4), path.AsSpan(0, 2), @"\", path.AsSpan(2));
                 }
             }
             else

src/Common/src/CoreLib/System/IO/PathHelper.Windows.cs

@@ -84,7 +84,7 @@ private static int PrependDevicePathChars(ref ValueStringBuilder content, bool i
                 buffer.Append(PathInternal.UncExtendedPathPrefix);
 
                 // Copy Server\Share\... over to the buffer
-                buffer.Append(content.AsSpan().Slice(PathInternal.UncPrefixLength));
+                buffer.Append(content.AsSpan(PathInternal.UncPrefixLength));
 
                 // Return the prefix difference
                 return PathInternal.UncExtendedPrefixLength - PathInternal.UncPrefixLength;
@@ -198,7 +198,7 @@ private static string TryExpandShortFileName(ref ValueStringBuilder outputBuilde
                     if (foundIndex < inputLength - 1)
                     {
                         // It was a partial find, put the non-existent part of the path back
-                        outputBuilder.Append(inputBuilder.AsSpan().Slice(foundIndex, inputBuilder.Length - foundIndex));
+                        outputBuilder.Append(inputBuilder.AsSpan(foundIndex, inputBuilder.Length - foundIndex));
                     }
                 }
             }
@@ -218,7 +218,7 @@ private static string TryExpandShortFileName(ref ValueStringBuilder outputBuilde
                 builderToUse[PathInternal.UncExtendedPrefixLength - PathInternal.UncPrefixLength] = '\\';
 
             // Strip out any added characters at the front of the string
-            ReadOnlySpan<char> output = builderToUse.AsSpan().Slice(rootDifference);
+            ReadOnlySpan<char> output = builderToUse.AsSpan(rootDifference);
 
             string returnValue = output.EqualsOrdinal(originalPath.AsSpan())
                 ? originalPath : new string(output);

src/Common/src/CoreLib/System/String.Manipulation.cs

@@ -897,7 +897,7 @@ public string Remove(int startIndex, int count)
             return result;
         }
 
-        // a remove that just takes a startindex. 
+        // a remove that just takes a startindex.
         public string Remove(int startIndex)
         {
             if (startIndex < 0)
@@ -1136,7 +1136,7 @@ private string ReplaceHelper(int oldValueLength, string newValue, ReadOnlySpan<i
                 int count = replacementIdx - thisIdx;
                 if (count != 0)
                 {
-                    this.AsSpan().Slice(thisIdx, count).CopyTo(dstSpan.Slice(dstIdx));
+                    this.AsSpan(thisIdx, count).CopyTo(dstSpan.Slice(dstIdx));
                     dstIdx += count;
                 }
                 thisIdx = replacementIdx + oldValueLength;
@@ -1148,7 +1148,7 @@ private string ReplaceHelper(int oldValueLength, string newValue, ReadOnlySpan<i
 
             // Copy over the final non-matching portion at the end of the string.
             Debug.Assert(this.Length - thisIdx == dstSpan.Length - dstIdx);
-            this.AsSpan().Slice(thisIdx).CopyTo(dstSpan.Slice(dstIdx));
+            this.AsSpan(thisIdx).CopyTo(dstSpan.Slice(dstIdx));
 
             return dst;
         }
@@ -1236,7 +1236,7 @@ private string[] SplitInternal(ReadOnlySpan<char> separators, int count, StringS
                 return new string[] { this };
             }
 
-            string[] result = omitEmptyEntries 
+            string[] result = omitEmptyEntries
                 ? SplitOmitEmptyEntries(sepList, default, 1, count)
                 : SplitKeepEmptyEntries(sepList, default, 1, count);
 
@@ -1301,7 +1301,7 @@ private string[] SplitInternal(string separator, string[] separators, int count,
             {
                 return SplitInternal(separator, count, options);
             }
-            
+
             Span<int> sepListInitialSpan = stackalloc int[StackallocIntBufferSizeLimit];
             var sepListBuilder = new ValueListBuilder<int>(sepListInitialSpan);
 
@@ -1311,14 +1311,14 @@ private string[] SplitInternal(string separator, string[] separators, int count,
             MakeSeparatorList(separators, ref sepListBuilder, ref lengthListBuilder);
             ReadOnlySpan<int> sepList = sepListBuilder.AsSpan();
             ReadOnlySpan<int> lengthList = lengthListBuilder.AsSpan();
-            
+
             // Handle the special case of no replaces.
             if (sepList.Length == 0)
             {
                 return new string[] { this };
             }
 
-            string[] result = omitEmptyEntries 
+            string[] result = omitEmptyEntries
                 ? SplitOmitEmptyEntries(sepList, lengthList, 0, count)
                 : SplitKeepEmptyEntries(sepList, lengthList, 0, count);
 
@@ -1341,7 +1341,7 @@ private string[] SplitInternal(string separator, int count, StringSplitOptions o
                 return new string[] { this };
             }
 
-            string[] result = options == StringSplitOptions.RemoveEmptyEntries 
+            string[] result = options == StringSplitOptions.RemoveEmptyEntries
                 ? SplitOmitEmptyEntries(sepList, default, separator.Length, count)
                 : SplitKeepEmptyEntries(sepList, default, separator.Length, count);
 
@@ -1386,15 +1386,15 @@ private string[] SplitKeepEmptyEntries(ReadOnlySpan<int> sepList, ReadOnlySpan<i
         }
 
 
-        // This function will not keep the Empty string 
+        // This function will not keep the Empty string
         private string[] SplitOmitEmptyEntries(ReadOnlySpan<int> sepList, ReadOnlySpan<int> lengthList, int defaultLength, int count)
         {
             Debug.Assert(count >= 2);
 
             int numReplaces = sepList.Length;
 
-            // Allocate array to hold items. This array may not be 
-            // filled completely in this function, we will create a 
+            // Allocate array to hold items. This array may not be
+            // filled completely in this function, we will create a
             // new array and copy string references to that new array.
             int maxItems = (numReplaces < count) ? (numReplaces + 1) : count;
             string[] splitStrings = new string[maxItems];
@@ -1555,7 +1555,7 @@ private void MakeSeparatorList(string separator, ref ValueListBuilder<int> sepLi
         /// </summary>
         /// <param name="separators">separator strngs</param>
         /// <param name="sepListBuilder"><see cref="ValueListBuilder{T}"/> for separator indexes</param>
-        /// <param name="lengthListBuilder"><see cref="ValueListBuilder{T}"/> for separator length values</param>        
+        /// <param name="lengthListBuilder"><see cref="ValueListBuilder{T}"/> for separator length values</param>
         private void MakeSeparatorList(string[] separators, ref ValueListBuilder<int> sepListBuilder, ref ValueListBuilder<int> lengthListBuilder)
         {
             Debug.Assert(separators != null && separators.Length > 0, "separators != null && separators.Length > 0");