Skip to content

Bump to head of mono 2018-02 which includes the removal of Span<T> #4124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spouliot merged 2 commits into from
May 24, 2018
Merged

Bump to head of mono 2018-02 which includes the removal of Span<T> #4124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76c38f2
Bump to head of mono 2018-02 which includes the removal of Span<T>
spouliot May 24, 2018
cd63ed1
[compression] Hide API using Span until it's back (publicly) in mono
spouliot May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 17 files
+1 −1 external/api-snapshot
+1 −1 external/corefx
+10 −10 mcs/class/Facades/System.Memory/TypeForwarders.cs
+1 −1 mcs/class/System.Numerics/Makefile
+4 −0 mcs/class/System/System.Net.Sockets/Socket.cs
+2 −2 mcs/class/System/System_xtest.dll.sources
+1 −0 mcs/class/corlib/Assembly/AssemblyInfo.cs
+1 −1 mcs/class/corlib/Makefile
+2 −3 mcs/class/corlib/ReferenceSources/String.cs
+4 −4 mcs/class/corlib/corert/Stream.cs
+6 −6 mcs/class/corlib/corlib_xtest.dll.sources
+1 −1 mcs/class/referencesource/mscorlib/system/bitconverter.cs
+1 −1 mcs/class/referencesource/mscorlib/system/int32.cs
+1 −1 mcs/class/referencesource/mscorlib/system/text/encoding.cs
+0 −13 mcs/errors/cs8346.cs
+0 −22 mcs/tests/test-948.cs
+10 −13 mcs/tests/ver-il-net_4_x.xml
12 changes: 8 additions & 4 deletions src/Compression/Compression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ public override int Read (byte[] array, int offset, int count)
return ReadCore (new Span<byte> (array, offset, count));
}

public override int Read (Span<byte> destination)
// FIXME needs Span
internal override int Read (Span<byte> destination)
{
if (GetType () != typeof (CompressionStream)) {
// CompressStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior
Expand Down Expand Up @@ -312,7 +313,8 @@ public override Task<int> ReadAsync (byte[] array, int offset, int count, Cancel
return ReadAsyncMemory (new Memory<byte>(array, offset, count), cancellationToken).AsTask ();
}

public override ValueTask<int> ReadAsync (Memory<byte> destination, CancellationToken cancellationToken = default(CancellationToken))
// FIXME needs Span
internal override ValueTask<int> ReadAsync (Memory<byte> destination, CancellationToken cancellationToken = default(CancellationToken))
{
if (GetType () != typeof (CompressionStream)) {
// Ensure that existing streams derived from DeflateStream and that override ReadAsync(byte[],...)
Expand Down Expand Up @@ -405,7 +407,8 @@ public override void Write (byte[] array, int offset, int count)
WriteCore (new ReadOnlySpan<byte> (array, offset, count));
}

public override void Write (ReadOnlySpan<byte> source)
// FIXME needs Span
internal override void Write (ReadOnlySpan<byte> source)
{
if (GetType () != typeof (CompressionStream)) {
// DeflateStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior
Expand Down Expand Up @@ -558,7 +561,8 @@ public override Task WriteAsync (byte[] array, int offset, int count, Cancellati
return WriteAsyncMemory (new ReadOnlyMemory<byte> (array, offset, count), cancellationToken);
}

public override Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
// FIXME needs Span
internal override Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
{
if (GetType () != typeof (CompressionStream)) {
// Ensure that existing streams derived from DeflateStream and that override WriteAsync(byte[],...)
Expand Down