From fb593470d553c68b77e7ec129c47cfd9a21097d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Feb 2024 21:02:20 +0800
Subject: [PATCH] Use `DEFAULT` instead of `INSTANCE` or static field

Matches other similar comparers.
---
 osu.Game.Benchmarks/BenchmarkStringComparison.cs       | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs | 8 ++++----
 osu.Game/Utils/OrdinalSortByCaseStringComparer.cs      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Benchmarks/BenchmarkStringComparison.cs b/osu.Game.Benchmarks/BenchmarkStringComparison.cs
index 78e4130abe30..d40b92db5f06 100644
--- a/osu.Game.Benchmarks/BenchmarkStringComparison.cs
+++ b/osu.Game.Benchmarks/BenchmarkStringComparison.cs
@@ -31,7 +31,7 @@ public void GlobalSetUp()
         public void OrdinalIgnoreCase() => compare(StringComparer.OrdinalIgnoreCase);
 
         [Benchmark]
-        public void OrdinalSortByCase() => compare(OrdinalSortByCaseStringComparer.INSTANCE);
+        public void OrdinalSortByCase() => compare(OrdinalSortByCaseStringComparer.DEFAULT);
 
         [Benchmark]
         public void InvariantCulture() => compare(StringComparer.InvariantCulture);
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index bf0d7dcbdefc..43c9c621e87a 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -68,19 +68,19 @@ public override int CompareTo(FilterCriteria criteria, CarouselItem other)
             {
                 default:
                 case SortMode.Artist:
-                    comparison = OrdinalSortByCaseStringComparer.INSTANCE.Compare(BeatmapSet.Metadata.Artist, otherSet.BeatmapSet.Metadata.Artist);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Artist, otherSet.BeatmapSet.Metadata.Artist);
                     break;
 
                 case SortMode.Title:
-                    comparison = OrdinalSortByCaseStringComparer.INSTANCE.Compare(BeatmapSet.Metadata.Title, otherSet.BeatmapSet.Metadata.Title);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Title, otherSet.BeatmapSet.Metadata.Title);
                     break;
 
                 case SortMode.Author:
-                    comparison = OrdinalSortByCaseStringComparer.INSTANCE.Compare(BeatmapSet.Metadata.Author.Username, otherSet.BeatmapSet.Metadata.Author.Username);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Author.Username, otherSet.BeatmapSet.Metadata.Author.Username);
                     break;
 
                 case SortMode.Source:
-                    comparison = OrdinalSortByCaseStringComparer.INSTANCE.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source);
+                    comparison = OrdinalSortByCaseStringComparer.DEFAULT.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source);
                     break;
 
                 case SortMode.DateAdded:
diff --git a/osu.Game/Utils/OrdinalSortByCaseStringComparer.cs b/osu.Game/Utils/OrdinalSortByCaseStringComparer.cs
index 99d73f644f8d..6c1532eef569 100644
--- a/osu.Game/Utils/OrdinalSortByCaseStringComparer.cs
+++ b/osu.Game/Utils/OrdinalSortByCaseStringComparer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Utils
     /// </example>
     public class OrdinalSortByCaseStringComparer : IComparer<string>
     {
-        public static readonly OrdinalSortByCaseStringComparer INSTANCE = new OrdinalSortByCaseStringComparer();
+        public static readonly OrdinalSortByCaseStringComparer DEFAULT = new OrdinalSortByCaseStringComparer();
 
         private OrdinalSortByCaseStringComparer()
         {