Use DEFAULT instead of INSTANCE or static field

Matches other similar comparers.
ppy · Feb 21, 2024 · fb59347 · fb59347
1 parent 9298582
commit fb59347
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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()
         {