From ae133c6ac4dd3a924b18f975f5c06fd6fd8a9cff Mon Sep 17 00:00:00 2001
From: Jason Nelson <jason@carbonmade.com>
Date: Tue, 27 Mar 2018 10:01:50 -0700
Subject: [PATCH] Remove SpanHelper.Copy

---
 src/ImageSharp/Memory/SpanHelper.cs              | 16 +---------------
 .../ImageSharp.Tests/Memory/SpanUtilityTests.cs  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/ImageSharp/Memory/SpanHelper.cs b/src/ImageSharp/Memory/SpanHelper.cs
index 4a6b7b7ce6..592e2a885b 100644
--- a/src/ImageSharp/Memory/SpanHelper.cs
+++ b/src/ImageSharp/Memory/SpanHelper.cs
@@ -11,20 +11,6 @@ namespace SixLabors.ImageSharp.Memory
     /// </summary>
     internal static class SpanHelper
     {
-        /// <summary>
-        /// Copy 'count' number of elements of the same type from 'source' to 'dest'
-        /// </summary>
-        /// <typeparam name="T">The element type.</typeparam>
-        /// <param name="source">The <see cref="Span{T}"/> to copy elements from.</param>
-        /// <param name="destination">The destination <see cref="Span{T}"/>.</param>
-        /// <param name="count">The number of elements to copy</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe void Copy<T>(ReadOnlySpan<T> source, Span<T> destination, int count)
-            where T : struct
-        {
-            source.Slice(0, count).CopyTo(destination);
-        }
-
         /// <summary>
         /// Copy all elements of 'source' into 'destination'.
         /// </summary>
@@ -35,7 +21,7 @@ namespace SixLabors.ImageSharp.Memory
         public static void Copy<T>(ReadOnlySpan<T> source, Span<T> destination)
             where T : struct
         {
-            Copy(source, destination, Math.Min(source.Length, destination.Length));
+            source.Slice(0, Math.Min(source.Length, destination.Length)).CopyTo(destination);
         }
 
         /// <summary>
diff --git a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
index a813e0c1dd..908830fb7c 100644
--- a/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
+++ b/tests/ImageSharp.Tests/Memory/SpanUtilityTests.cs
@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<TestStructs.Foo>(source, 1, source.Length - 1);
                 var apDest = new Span<TestStructs.Foo>(dest, 1, dest.Length - 1);
 
-                SpanHelper.Copy(apSource, apDest, count - 1);
+                apSource.Slice(0, count - 1).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
                 AssertNotDefault(dest, 1);
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<TestStructs.AlignedFoo>(source, 1, source.Length - 1);
                 var apDest = new Span<TestStructs.AlignedFoo>(dest, 1, dest.Length - 1);
 
-                SpanHelper.Copy(apSource, apDest, count - 1);
+                apSource.Slice(0, count - 1).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
                 AssertNotDefault(dest, 1);
@@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<int>(source, 1, source.Length - 1);
                 var apDest = new Span<int>(dest, 1, dest.Length - 1);
 
-                SpanHelper.Copy(apSource, apDest, count - 1);
+                apSource.Slice(0, count - 1).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
                 AssertNotDefault(dest, 1);
@@ -136,7 +136,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<TestStructs.Foo>(source, 1, source.Length - 1);
                 var apDest = new Span<byte>(dest, sizeof(TestStructs.Foo), dest.Length - sizeof(TestStructs.Foo));
 
-                SpanHelper.Copy(apSource.AsBytes(), apDest, (count - 1) * sizeof(TestStructs.Foo));
+                apSource.AsBytes().Slice(0, (count - 1) * sizeof(TestStructs.Foo)).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
 
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<TestStructs.AlignedFoo>(source, 1, source.Length - 1);
                 var apDest = new Span<byte>(dest, sizeof(TestStructs.AlignedFoo), dest.Length - sizeof(TestStructs.AlignedFoo));
 
-                SpanHelper.Copy(apSource.AsBytes(), apDest, (count - 1) * sizeof(TestStructs.AlignedFoo));
+                apSource.AsBytes().Slice(0, (count - 1) * sizeof(TestStructs.AlignedFoo)).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
 
@@ -182,7 +182,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 var apSource = new Span<int>(source);
                 var apDest = new Span<byte>(dest);
 
-                SpanHelper.Copy(apSource.AsBytes(), apDest, count * sizeof(int));
+                apSource.AsBytes().Slice(0, count * sizeof(int)).CopyTo(apDest);
 
                 AssertNotDefault(source, 1);
 
@@ -198,12 +198,12 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 int srcCount = count * sizeof(TestStructs.Foo);
                 byte[] source = CreateTestBytes(srcCount);
-                TestStructs.Foo[] dest = new TestStructs.Foo[count + 2];
+                var dest = new TestStructs.Foo[count + 2];
 
                 var apSource = new Span<byte>(source);
                 var apDest = new Span<TestStructs.Foo>(dest);
 
-                SpanHelper.Copy(apSource, apDest.AsBytes(), count * sizeof(TestStructs.Foo));
+                apSource.Slice(0, count * sizeof(TestStructs.Foo)).CopyTo(apDest.AsBytes());
 
                 AssertNotDefault(source, sizeof(TestStructs.Foo) + 1);
                 AssertNotDefault(dest, 1);