Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 124c68c

Browse files
authored
Removing SequenceMarshal.TryGetMemoryManager for ReadOnlySequence (#28990)
1 parent 4df2b0f commit 124c68c

File tree

4 files changed

+0
-34
lines changed

4 files changed

+0
-34
lines changed

src/System.Memory/ref/System.Memory.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,6 @@ public static void Write<T>(System.Span<byte> destination, ref T value) where T
542542
public static partial class SequenceMarshal
543543
{
544544
public static bool TryGetArray<T>(System.Buffers.ReadOnlySequence<T> sequence, out System.ArraySegment<T> segment) { throw null; }
545-
public static bool TryGetMemoryManager<T>(System.Buffers.ReadOnlySequence<T> sequence, out System.Buffers.MemoryManager<T> manager, out int start, out int length) { throw null; }
546545
public static bool TryGetReadOnlyMemory<T>(System.Buffers.ReadOnlySequence<T> sequence, out System.ReadOnlyMemory<T> memory) { throw null; }
547546
public static bool TryGetReadOnlySequenceSegment<T>(System.Buffers.ReadOnlySequence<T> sequence, out System.Buffers.ReadOnlySequenceSegment<T> startSegment, out int startIndex, out System.Buffers.ReadOnlySequenceSegment<T> endSegment, out int endIndex) { throw null; }
548547
}

src/System.Memory/src/System/Buffers/ReadOnlySequence_helpers.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -322,25 +322,6 @@ internal bool TryGetArray(out ArraySegment<T> segment)
322322
return true;
323323
}
324324

325-
internal bool TryGetMemoryManager(out MemoryManager<T> manager, out int start, out int length)
326-
{
327-
GetTypeAndIndices(Start.GetInteger(), End.GetInteger(), out SequenceType type, out start, out int endIndex);
328-
329-
if (type != SequenceType.MemoryManager)
330-
{
331-
manager = default;
332-
length = 0;
333-
return false;
334-
}
335-
336-
Debug.Assert(Start.GetObject() != null);
337-
Debug.Assert(Start.GetObject() is MemoryManager<T>);
338-
339-
manager = Unsafe.As<MemoryManager<T>>(Start.GetObject());
340-
length = endIndex - start;
341-
return true;
342-
}
343-
344325
internal bool TryGetReadOnlyMemory(out ReadOnlyMemory<T> memory)
345326
{
346327
GetTypeAndIndices(Start.GetInteger(), End.GetInteger(), out SequenceType type, out int startIndex, out int endIndex);

src/System.Memory/src/System/Runtime/InteropServices/SequenceMarshal.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ public static bool TryGetArray<T>(ReadOnlySequence<T> sequence, out ArraySegment
3333
return sequence.TryGetArray(out segment);
3434
}
3535

36-
/// <summary>
37-
/// Get <see cref="MemoryManager{T}"/> from the underlying <see cref="ReadOnlySequence{T}"/>.
38-
/// If unable to get the <see cref="MemoryManager{T}"/>, return false.
39-
/// </summary>
40-
public static bool TryGetMemoryManager<T>(ReadOnlySequence<T> sequence, out MemoryManager<T> manager, out int start, out int length)
41-
{
42-
return sequence.TryGetMemoryManager(out manager, out start, out length);
43-
}
44-
4536
/// <summary>
4637
/// Get <see cref="ReadOnlyMemory{T}"/> from the underlying <see cref="ReadOnlySequence{T}"/>.
4738
/// If unable to get the <see cref="ReadOnlyMemory{T}"/>, return false.

src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.TryGet.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public void Ctor_Array_Offset()
2121
Assert.Equal(3, array.Count);
2222

2323
Assert.False(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out _, out _, out _, out _));
24-
Assert.False(SequenceMarshal.TryGetMemoryManager(buffer, out _, out _, out _));
2524

2625
// Array can be retrieved with TryGetReadOnlyMemory
2726
Assert.True(SequenceMarshal.TryGetReadOnlyMemory(buffer, out ReadOnlyMemory<byte> newMemory));
@@ -38,7 +37,6 @@ public void Ctor_Memory()
3837
Assert.Equal(new byte[] { 3, 4, 5 }, newMemory.ToArray());
3938

4039
Assert.False(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out ReadOnlySequenceSegment<byte> startSegment, out int startIndex, out ReadOnlySequenceSegment<byte> endSegment, out int endIndex));
41-
Assert.False(SequenceMarshal.TryGetMemoryManager(buffer, out _, out _, out _));
4240

4341
// Memory is internally decomposed to its container so it would be accessible via TryGetArray
4442
Assert.True(SequenceMarshal.TryGetArray(buffer, out ArraySegment<byte> array));
@@ -58,7 +56,6 @@ public void Ctor_Memory_String()
5856
Assert.Equal(text.Substring(2, 3).ToCharArray(), newMemory.ToArray());
5957

6058
Assert.False(SequenceMarshal.TryGetReadOnlySequenceSegment(buffer, out ReadOnlySequenceSegment<char> startSegment, out int startIndex, out ReadOnlySequenceSegment<char> endSegment, out int endIndex));
61-
Assert.False(SequenceMarshal.TryGetMemoryManager(buffer, out _, out _, out _));
6259
Assert.False(SequenceMarshal.TryGetArray(buffer, out _));
6360
}
6461

@@ -77,7 +74,6 @@ public void Ctor_IMemoryList_SingleBlock()
7774
Assert.Equal(5, endIndex);
7875

7976
Assert.False(SequenceMarshal.TryGetArray(buffer, out _));
80-
Assert.False(SequenceMarshal.TryGetMemoryManager(buffer, out _, out _, out _));
8177

8278
// Single block can be retrieved with TryGetReadOnlyMemory
8379
Assert.True(SequenceMarshal.TryGetReadOnlyMemory(buffer, out ReadOnlyMemory<byte> newMemory));
@@ -100,7 +96,6 @@ public void Ctor_IMemoryList_MultiBlock()
10096
Assert.Equal(1, endIndex);
10197

10298
Assert.False(SequenceMarshal.TryGetArray(buffer, out _));
103-
Assert.False(SequenceMarshal.TryGetMemoryManager(buffer, out _, out _, out _));
10499

105100
// Multi-block can't be retrieved with TryGetReadOnlyMemory
106101
Assert.False(SequenceMarshal.TryGetReadOnlyMemory(buffer, out _));

0 commit comments

Comments
 (0)