diff --git a/src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs b/src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs index 2dcbf4cb3e171e..c165695f8348a1 100644 --- a/src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs +++ b/src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs @@ -540,7 +540,7 @@ public async Task ReadBodyAsync(bool expectEndOfStream = false) byte[] newBuffer = new byte[body.Length + dataFrame.Data.Length]; body.CopyTo(newBuffer, 0); - dataFrame.Data.Span.CopyTo(newBuffer.AsSpan().Slice(body.Length)); + dataFrame.Data.Span.CopyTo(newBuffer.AsSpan(body.Length)); body= newBuffer; } } @@ -764,7 +764,7 @@ public async Task SendResponseHeadersAsync(int streamId, bool endStream = true, flags |= FrameFlags.EndStream; } - HeadersFrame headersFrame = new HeadersFrame(headerBlock.AsMemory().Slice(0, bytesGenerated), flags, 0, 0, 0, streamId); + HeadersFrame headersFrame = new HeadersFrame(headerBlock.AsMemory(0, bytesGenerated), flags, 0, 0, 0, streamId); await WriteFrameAsync(headersFrame).ConfigureAwait(false); } diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/AnsiParsingLogConsole.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/AnsiParsingLogConsole.cs index 6a4473289b2877..2b540ec86cee3e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/AnsiParsingLogConsole.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/AnsiParsingLogConsole.cs @@ -57,7 +57,7 @@ private void ResetColor() private void WriteToConsole(string message, int startIndex, int length, ConsoleColor? background, ConsoleColor? foreground) { - ReadOnlySpan span = message.AsSpan().Slice(startIndex, length); + ReadOnlySpan span = message.AsSpan(startIndex, length); var colorChanged = SetColor(background, foreground); #if NETCOREAPP _textWriter.Write(span); diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/AnsiParserTests.cs b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/AnsiParserTests.cs index fbe579c0764592..74d04894eba40c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/AnsiParserTests.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/AnsiParserTests.cs @@ -25,7 +25,7 @@ public void Parse_CheckTimesWrittenToConsole(int numSegments, string message, st segments.Add(new ConsoleContext() { BackgroundColor = bg, ForegroundColor = fg, - Message = message.AsSpan().Slice(startIndex, length).ToString() + Message = message.AsSpan(startIndex, length).ToString() }); }; var parser = new AnsiParser(onParseWrite); @@ -53,7 +53,7 @@ public void Parse_SetBackgroundForegroundAndMessageThenReset_Success(ConsoleColo segments.Add(new ConsoleContext() { BackgroundColor = bg, ForegroundColor = fg, - Message = message.AsSpan().Slice(startIndex, length).ToString() + Message = message.AsSpan(startIndex, length).ToString() }); }; var parser = new AnsiParser(onParseWrite); @@ -91,7 +91,7 @@ public void Parse_MessageWithMultipleColors_ParsedIntoMultipleSegments() segments.Add(new ConsoleContext() { BackgroundColor = bg, ForegroundColor = fg, - Message = message.AsSpan().Slice(startIndex, length).ToString() + Message = message.AsSpan(startIndex, length).ToString() }); }; var parser = new AnsiParser(onParseWrite); @@ -134,7 +134,7 @@ public void Parse_RepeatedColorChange_PicksLastSet() segments.Add(new ConsoleContext() { BackgroundColor = bg, ForegroundColor = fg, - Message = message.AsSpan().Slice(startIndex, length).ToString() + Message = message.AsSpan(startIndex, length).ToString() }); }; var parser = new AnsiParser(onParseWrite); @@ -187,7 +187,7 @@ public void Parse_ValidSupportedOrUnsupportedCodesInMessage_MessageParsedSuccess segments.Add(new ConsoleContext() { BackgroundColor = bg, ForegroundColor = fg, - Message = message.AsSpan().Slice(startIndex, length).ToString() + Message = message.AsSpan(startIndex, length).ToString() }); }; var parser = new AnsiParser(onParseWrite); diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Console/TestConsole.cs b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Console/TestConsole.cs index c6040753d9c955..e94e76492f8e77 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Console/TestConsole.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Console/TestConsole.cs @@ -34,7 +34,7 @@ public void Write(string message) public void OnParseWrite(string message, int startIndex, int length, ConsoleColor? background, ConsoleColor? foreground) { var consoleContext = new ConsoleContext(); - consoleContext.Message = message.AsSpan().Slice(startIndex, length).ToString(); + consoleContext.Message = message.AsSpan(startIndex, length).ToString(); if (background.HasValue) { diff --git a/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs b/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs index 60ffc733c6d4dc..b3ffa187f454b3 100644 --- a/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs +++ b/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs @@ -462,12 +462,12 @@ public async Task CanReadPartial() var length = 4; var read = new byte[length]; stream.Read(read, 0, length); - Assert.Equal(buffer.AsMemory().Slice(0, length).ToArray(), read.AsMemory().Slice(0, length).ToArray()); + Assert.Equal(buffer.AsMemory(0, length).ToArray(), read.AsMemory(0, length).ToArray()); read = new byte[length]; stream.Position = 0; await stream.ReadAsync(read, 0, length); - Assert.Equal(buffer.AsMemory().Slice(0, length).ToArray(), read.AsMemory().Slice(0, length).ToArray()); + Assert.Equal(buffer.AsMemory(0, length).ToArray(), read.AsMemory(0, length).ToArray()); // no-op as we are at end of stream stream.Read(read, 0, length); diff --git a/src/libraries/System.Memory/tests/BuffersExtensions/BuffersExtensionsTests.cs b/src/libraries/System.Memory/tests/BuffersExtensions/BuffersExtensionsTests.cs index 26e4c572c0958c..fc55fbe29fad49 100644 --- a/src/libraries/System.Memory/tests/BuffersExtensions/BuffersExtensionsTests.cs +++ b/src/libraries/System.Memory/tests/BuffersExtensions/BuffersExtensionsTests.cs @@ -107,9 +107,9 @@ public void Advance(int bytes) _written += bytes; } - public Memory GetMemory(int sizeHint = 0) => _buffer.AsMemory().Slice(_written); + public Memory GetMemory(int sizeHint = 0) => _buffer.AsMemory(_written); - public Span GetSpan(int sizeHint) => _buffer.AsSpan().Slice(_written); + public Span GetSpan(int sizeHint) => _buffer.AsSpan(_written); public override string ToString() { diff --git a/src/libraries/System.Memory/tests/Span/AsSpan.cs b/src/libraries/System.Memory/tests/Span/AsSpan.cs index d11b5b64420275..9f51798b5c2a94 100644 --- a/src/libraries/System.Memory/tests/Span/AsSpan.cs +++ b/src/libraries/System.Memory/tests/Span/AsSpan.cs @@ -108,7 +108,7 @@ public static void GuidArrayAsSpanWithStartAndLength() { var arr = new Guid[20]; - Span slice = arr.AsSpan().Slice(2, 2); + Span slice = arr.AsSpan(2, 2); Guid guid = Guid.NewGuid(); slice[1] = guid; diff --git a/src/libraries/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Unix.cs b/src/libraries/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Unix.cs index 44ac5729415f56..3f0bbbc7b91709 100644 --- a/src/libraries/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Unix.cs +++ b/src/libraries/System.Net.Ping/src/System/Net/NetworkInformation/Ping.Unix.cs @@ -462,7 +462,7 @@ private static unsafe byte[] CreateSendMessageBuffer(IpHeader ipHeader, IcmpHead payload.CopyTo(result, offset + icmpHeaderSize); // offset now still points to beginning of ICMP header. - ushort checksum = ComputeBufferChecksum(result.AsSpan().Slice(offset)); + ushort checksum = ComputeBufferChecksum(result.AsSpan(offset)); // Jam the checksum into the buffer. result[offset + 2] = (byte)(checksum >> 8); result[offset + 3] = (byte)(checksum & (0xFF)); diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs index 3da7e7e9bf8d36..f3c15174652f69 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs @@ -249,7 +249,7 @@ public async Task LargeDataSentAndReceived() int totalBytesRead = 0; while (totalBytesRead < data.Length) { - int bytesRead = await stream.ReadAsync(buffer.AsMemory().Slice(totalBytesRead)); + int bytesRead = await stream.ReadAsync(buffer.AsMemory(totalBytesRead)); Assert.NotEqual(0, bytesRead); totalBytesRead += bytesRead; } @@ -288,7 +288,7 @@ public async Task LargeDataSentAndReceived() int totalBytesRead = 0; while (totalBytesRead < data.Length) { - int bytesRead = await stream.ReadAsync(buffer.AsMemory().Slice(totalBytesRead)); + int bytesRead = await stream.ReadAsync(buffer.AsMemory(totalBytesRead)); Assert.NotEqual(0, bytesRead); totalBytesRead += bytesRead; } diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/StressOperations.cs b/src/libraries/System.Net.Security/tests/StressTests/SslStress/StressOperations.cs index d6a1a360f7e224..8c2ec6f35e49d8 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/StressOperations.cs +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/StressOperations.cs @@ -77,11 +77,11 @@ public async Task SerializeAsync(Stream stream, DataSegment segment, Random? ran { // length int numsize = s_encoding.GetBytes(segment.Length.ToString(), _buffer); - await stream.WriteAsync(_buffer.AsMemory().Slice(0, numsize), token); + await stream.WriteAsync(_buffer.AsMemory(0, numsize), token); stream.WriteByte((byte)','); // checksum numsize = s_encoding.GetBytes(segment.Checksum.ToString(), _buffer); - await stream.WriteAsync(_buffer.AsMemory().Slice(0, numsize), token); + await stream.WriteAsync(_buffer.AsMemory(0, numsize), token); stream.WriteByte((byte)','); // payload Memory source = segment.AsMemory(); @@ -147,7 +147,7 @@ public DataSegment Deserialize(ReadOnlySequence buffer) ReadOnlySequence lengthBytes = buffer.Slice(0, pos.Value); int numSize = s_encoding.GetChars(lengthBytes.ToArray(), _charBuffer); - int length = int.Parse(_charBuffer.AsSpan().Slice(0, numSize)); + int length = int.Parse(_charBuffer.AsSpan(0, numSize)); buffer = buffer.Slice(buffer.GetPosition(1, pos.Value)); // checksum @@ -159,7 +159,7 @@ public DataSegment Deserialize(ReadOnlySequence buffer) ReadOnlySequence checksumBytes = buffer.Slice(0, pos.Value); numSize = s_encoding.GetChars(checksumBytes.ToArray(), _charBuffer); - ulong checksum = ulong.Parse(_charBuffer.AsSpan().Slice(0, numSize)); + ulong checksum = ulong.Parse(_charBuffer.AsSpan(0, numSize)); buffer = buffer.Slice(buffer.GetPosition(1, pos.Value)); // payload @@ -285,10 +285,10 @@ Task Callback(ReadOnlySequence buffer) return Task.CompletedTask; } } - + async Task Monitor(CancellationToken token) { - do + do { await Task.Delay(500); diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/CreateSocketTests.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/CreateSocketTests.cs index 507efc00d281e8..c291583fd54d78 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/CreateSocketTests.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/CreateSocketTests.cs @@ -609,7 +609,7 @@ public unsafe void Ctor_SafeHandle_UnknownSocket_Success() if (nlh.nlmsg_type == NLMSG_ERROR) { - MemoryMarshal.TryRead(response.AsSpan().Slice(sizeof(nlmsghdr)), out nlmsgerr err); + MemoryMarshal.TryRead(response.AsSpan(sizeof(nlmsghdr)), out nlmsgerr err); _output.WriteLine("Netlink request failed with {0}", err.error); } diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs index 2acd34cca39c39..f6bc99d8b1aa1f 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs @@ -25,7 +25,7 @@ public class SocketDuplicationTests private const string TestMessage = "test123!"; private static ArraySegment TestBytes => Encoding.ASCII.GetBytes(TestMessage); private static string GetMessageString(ArraySegment data, int count) => - Encoding.ASCII.GetString(data.AsSpan().Slice(0, count)); + Encoding.ASCII.GetString(data.AsSpan(0, count)); [Fact] public void UseOnlyOverlappedIO_AlwaysFalse() diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs index 8f89619276ffa5..cca0fb24cfc8aa 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CalendarData.Windows.cs @@ -388,7 +388,7 @@ internal static int GetCalendarsCore(string localeName, bool useUserOverride, Ca count = count < calendars.Length ? count + 1 : count; Span tmpSpan = stackalloc CalendarId[count]; // should be 23 max. tmpSpan[0] = userOverride; - calendars.AsSpan().Slice(0, count - 1).CopyTo(tmpSpan.Slice(1)); + calendars.AsSpan(0, count - 1).CopyTo(tmpSpan.Slice(1)); tmpSpan.CopyTo(calendars); } } diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs index 281b7269354199..6b90460a2e2b62 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs @@ -53,8 +53,8 @@ private static void LoadAppLocalIcu(string icuSuffixAndVersion) int indexOfSeparator = icuSuffixAndVersion.IndexOf(':'); if (indexOfSeparator >= 0) { - icuSuffix = icuSuffixAndVersion.AsSpan().Slice(0, indexOfSeparator); - version = icuSuffixAndVersion.AsSpan().Slice(icuSuffix.Length + 1); + icuSuffix = icuSuffixAndVersion.AsSpan(0, indexOfSeparator); + version = icuSuffixAndVersion.AsSpan(icuSuffix.Length + 1); } else { diff --git a/src/libraries/System.Runtime/tests/System/IndexTests.cs b/src/libraries/System.Runtime/tests/System/IndexTests.cs index 709c69f984023a..cc76de2d6e6ff7 100644 --- a/src/libraries/System.Runtime/tests/System/IndexTests.cs +++ b/src/libraries/System.Runtime/tests/System/IndexTests.cs @@ -126,7 +126,7 @@ public static void CollectionTest() Assert.Equal(i, array[Index.FromStart(i)]); Assert.Equal(list.Count - i - 1, array[^(i + 1)]); - Assert.Equal(array.AsSpan().Slice(i, array.Length - i).ToArray(), array[i..]); + Assert.Equal(array.AsSpan(i, array.Length - i).ToArray(), array[i..]); } } } diff --git a/src/libraries/System.Runtime/tests/System/RangeTests.cs b/src/libraries/System.Runtime/tests/System/RangeTests.cs index ea2c2f30f3e922..add55186d163b7 100644 --- a/src/libraries/System.Runtime/tests/System/RangeTests.cs +++ b/src/libraries/System.Runtime/tests/System/RangeTests.cs @@ -127,7 +127,7 @@ private class CustomRangeTester : IEquatable public CustomRangeTester(int [] data) => _data = data; public int Length => _data.Length; public int this[int index] => _data[index]; - public CustomRangeTester Slice(int start, int length) => new CustomRangeTester(_data.AsSpan().Slice(start, length).ToArray()); + public CustomRangeTester Slice(int start, int length) => new CustomRangeTester(_data.AsSpan(start, length).ToArray()); public int [] Data => _data; diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/SimpleRead.cs b/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/SimpleRead.cs index 8ba46c17402217..e17434b23af6cd 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/SimpleRead.cs +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/SimpleRead.cs @@ -118,7 +118,7 @@ public static void ReadWithEncryptedContents() Assert.Equal(Pkcs12ConfidentialityMode.None, authSafe[1].ConfidentialityMode); Assert.ThrowsAny( - () => authSafe[0].Decrypt(loader.Password.AsSpan().Slice(1))); + () => authSafe[0].Decrypt(loader.Password.AsSpan(1))); Assert.Equal(Pkcs12ConfidentialityMode.Password, authSafe[0].ConfidentialityMode); authSafe[0].Decrypt(loader.Password); diff --git a/src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness.cs b/src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness.cs index bbc174b0b1d9fc..e71bd36e36bd39 100644 --- a/src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness.cs +++ b/src/tests/JIT/Intrinsics/BinaryPrimitivesReverseEndianness.cs @@ -57,7 +57,7 @@ static int Main(string[] args) * SIGN-EXTENDED VALUE TESTS */ - Span spanInt16 = BitConverter.IsLittleEndian ? s_bufferLE.AsSpan().Slice(2) : s_bufferBE; + Span spanInt16 = BitConverter.IsLittleEndian ? s_bufferLE.AsSpan(2) : s_bufferBE; short swappedInt16 = BinaryPrimitives.ReverseEndianness(MemoryMarshal.Read(spanInt16)); if (swappedInt16 != ConstantUInt16Expected) {