diff --git a/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.EnsureCapacity.cs b/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.EnsureCapacity.cs index c3b32d8..7358c77 100644 --- a/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.EnsureCapacity.cs +++ b/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.EnsureCapacity.cs @@ -775,9 +775,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -847,7 +847,7 @@ namespace Recyclable.Collections.Benchmarks.POC DoRemoveAt(index); } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListV1() { @@ -1675,9 +1675,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -1816,7 +1816,7 @@ namespace Recyclable.Collections.Benchmarks.POC } } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListV2() { @@ -2638,9 +2638,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -2779,7 +2779,7 @@ namespace Recyclable.Collections.Benchmarks.POC } } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListV3() { diff --git a/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.IndexOf.cs b/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.IndexOf.cs index 06ab5dd..59598e5 100644 --- a/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.IndexOf.cs +++ b/Recyclable.Collections.Benchmarks/POC/RecyclableLongListPoc.Benchmarks.IndexOf.cs @@ -1068,9 +1068,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -1217,7 +1217,7 @@ namespace Recyclable.Collections.Benchmarks.POC } } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListIndexOfV1() { @@ -2213,9 +2213,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -2362,7 +2362,7 @@ namespace Recyclable.Collections.Benchmarks.POC } } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListIndexOfV2() { @@ -3330,9 +3330,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -3476,7 +3476,7 @@ namespace Recyclable.Collections.Benchmarks.POC } } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListIndexOfV3() { @@ -4484,9 +4484,9 @@ namespace Recyclable.Collections.Benchmarks.POC return lastBlockIndex < memoryBlocksSpan.Length && Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); - public IEnumerator GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + public IEnumerator GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); [MethodImpl(MethodImplOptions.AggressiveInlining)] public int IndexOf(T item) => _longCount == 0 @@ -4630,7 +4630,7 @@ namespace Recyclable.Collections.Benchmarks.POC } } - IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.RecyclableLongListHelpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => RecyclableLongList.Helpers.Enumerate(_memoryBlocks, _blockSize, LongCount).GetEnumerator(); ~RecyclableLongListIndexOfV4() { diff --git a/Recyclable.Collections/RecyclableLongList.Helpers.cs b/Recyclable.Collections/RecyclableLongList.Helpers.cs index b1713c1..823053f 100644 --- a/Recyclable.Collections/RecyclableLongList.Helpers.cs +++ b/Recyclable.Collections/RecyclableLongList.Helpers.cs @@ -2,7 +2,7 @@ { public partial class RecyclableLongList { - internal class RecyclableLongListHelpers + internal static class Helpers { public static void CopyTo(T[][] sourceMemoryBlocks, long startingIndex, int blockSize, long itemsCount, T[] destinationArray, int destinationArrayIndex) { diff --git a/Recyclable.Collections/RecyclableLongList.cs b/Recyclable.Collections/RecyclableLongList.cs index 90ef792..b1448d2 100644 --- a/Recyclable.Collections/RecyclableLongList.cs +++ b/Recyclable.Collections/RecyclableLongList.cs @@ -2,7 +2,6 @@ using System.Collections; using System.Numerics; using System.Runtime.CompilerServices; -using Recyclable.Collections.Pools; [assembly: InternalsVisibleTo("Recyclable.Collections.Benchmarks")] [assembly: InternalsVisibleTo("Recyclable.CollectionsTests")] @@ -1104,7 +1103,7 @@ namespace Recyclable.Collections return Array.IndexOf(memoryBlocksSpan[lastBlockIndex], item, 0, _nextItemIndex > 0 ? _nextItemIndex : _blockSize) >= 0; } - public void CopyTo(T[] array, int arrayIndex) => RecyclableLongList.RecyclableLongListHelpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); + public void CopyTo(T[] array, int arrayIndex) => Helpers.CopyTo(_memoryBlocks, 0, _blockSize, _longCount, array, arrayIndex); public Enumerator GetEnumerator() => new(this); IEnumerator IEnumerable.GetEnumerator() => new Enumerator(this);