icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 12:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Using EqualityComparer instead of Comparer for equality...

Browse Source
This commit is contained in:
Chris Cameron
2020-10-14 16:43:26 -04:00
parent c868034769
commit 0d85fe8106
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs
View File

@@ -537,7 +537,7 @@ namespace ICD.Common.Utils.Tests.Extensions
[Test] [Test]
public void ConsolidateComparerTest() public void ConsolidateComparerTest()
{ {
string[] sequence = new[] {"A", "B", "B", "C"}.Consolidate(Comparer<string>.Default).ToArray(); string[] sequence = new[] {"A", "B", "B", "C"}.Consolidate(EqualityComparer<string>.Default).ToArray();
Assert.AreEqual(3, sequence.Length, StringUtils.ArrayFormat(sequence)); Assert.AreEqual(3, sequence.Length, StringUtils.ArrayFormat(sequence));
Assert.AreEqual("A", sequence[0]); Assert.AreEqual("A", sequence[0]);

8
ICD.Common.Utils/Extensions/EnumerableExtensions.cs
View File

@@ -1539,7 +1539,7 @@ namespace ICD.Common.Utils.Extensions
if (extends == null) if (extends == null)
throw new ArgumentNullException("extends"); throw new ArgumentNullException("extends");
return Consolidate(extends, Comparer<T>.Default); return Consolidate(extends, EqualityComparer<T>.Default);
} }
/// <summary> /// <summary>
@@ -1555,7 +1555,7 @@ namespace ICD.Common.Utils.Extensions
/// <returns></returns> /// <returns></returns>
[PublicAPI] [PublicAPI]
public static IEnumerable<T> Consolidate<T>([NotNull] this IEnumerable<T> extends, public static IEnumerable<T> Consolidate<T>([NotNull] this IEnumerable<T> extends,
[NotNull] IComparer<T> comparer) [NotNull] IEqualityComparer<T> comparer)
{ {
if (extends == null) if (extends == null)
throw new ArgumentNullException("extends"); throw new ArgumentNullException("extends");
@@ -1578,14 +1578,14 @@ namespace ICD.Common.Utils.Extensions
/// <param name="comparer"></param> /// <param name="comparer"></param>
/// <returns></returns> /// <returns></returns>
private static IEnumerable<T> ConsolidateIterator<T>([NotNull] IEnumerable<T> sequence, private static IEnumerable<T> ConsolidateIterator<T>([NotNull] IEnumerable<T> sequence,
[NotNull] IComparer<T> comparer) [NotNull] IEqualityComparer<T> comparer)
{ {
bool first = true; bool first = true;
T last = default(T); T last = default(T);
foreach (T item in sequence) foreach (T item in sequence)
{ {
if (!first && comparer.Compare(last, item) == 0) if (!first && comparer.Equals(last, item))
continue; continue;
first = false; first = false;