From 078120e61814d3e4e79bd5d9d11c08ea24ce9113 Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Wed, 18 Oct 2023 19:06:09 +0900 Subject: [PATCH 1/2] Remove unused code --- Bencodex.Tests/Misc/CompositeComparerTest.cs | 35 -------------------- Bencodex/Misc/CompositeComparer.cs | 34 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 Bencodex.Tests/Misc/CompositeComparerTest.cs delete mode 100644 Bencodex/Misc/CompositeComparer.cs diff --git a/Bencodex.Tests/Misc/CompositeComparerTest.cs b/Bencodex.Tests/Misc/CompositeComparerTest.cs deleted file mode 100644 index 5f84c27..0000000 --- a/Bencodex.Tests/Misc/CompositeComparerTest.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using Bencodex.Misc; -using Xunit; - -namespace Bencodex.Tests.Misc -{ - public class CompositeComparerTest - { - [Fact] - public void TestComparison() - { - var comparer = new CompositeComparer( - StringComparer.Create(CultureInfo.InvariantCulture, true), - StringComparer.Create(CultureInfo.InvariantCulture, false) - ); - ComparerTestUtils.TestComparison( - comparer, - new List<(string, string)>() - { - (string.Empty, string.Empty), - (string.Empty, "world"), - (string.Empty, "world1"), - ("hello", string.Empty), - ("hello", "world"), - ("hello", "world1"), - ("hello1", string.Empty), - ("hello1", "world"), - ("hello1", "world1"), - } - ); - } - } -} diff --git a/Bencodex/Misc/CompositeComparer.cs b/Bencodex/Misc/CompositeComparer.cs deleted file mode 100644 index 34ce83a..0000000 --- a/Bencodex/Misc/CompositeComparer.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Bencodex.Misc -{ - /// Compose given two comparers into one comparer. - /// An element type of the first comparer. - /// An element type of the second comparer. - public struct CompositeComparer : IComparer> - { - public CompositeComparer(IComparer comparerA, IComparer comparerB) - { - ComparerA = - comparerA ?? throw new ArgumentNullException(nameof(comparerA)); - ComparerB = - comparerB ?? throw new ArgumentNullException(nameof(comparerB)); - } - - public IComparer ComparerA { get; } - - public IComparer ComparerB { get; } - - public int Compare((TA, TB) x, (TA, TB) y) - { - int resultA = ComparerA.Compare(x.Item1, y.Item1); - if (resultA != 0) - { - return resultA; - } - - return ComparerB.Compare(x.Item2, y.Item2); - } - } -} From 0ac74cb92d4a7bcb9f76c0fcd67fe72649a2bf74 Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Wed, 18 Oct 2023 19:07:37 +0900 Subject: [PATCH 2/2] Changelog --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 9a2bbba..c87c467 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ Version 0.15.0 To be released. + - Removed `CompositeComparer` struct. [[#109]] + +[#109]: https://github.com/planetarium/bencodex.net/pull/109 + Version 0.14.0 --------------