Skip to content

Commit 7bddedd

Browse files
fix: CI errors batch 2 - missing using, nullable, pattern matching, redundant casts, unused usings
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/45232cd1-6884-4c60-815e-dba288232c8c Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent a6e65e8 commit 7bddedd

6 files changed

Lines changed: 7 additions & 11 deletions

File tree

osu.Game.Rulesets.Catch/UI/Catcher.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System;
55
using System.Buffers;
66
using System.Diagnostics;
7-
using System.Linq;
87
using osu.Framework.Allocation;
98
using osu.Framework.Bindables;
109
using osu.Framework.Graphics;

osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Linq;
88
using osu.Framework.Localisation;
99
using osu.Game.Rulesets.Mods;
10+
using osu.Game.Rulesets.Objects.Drawables;
1011
using osu.Game.Rulesets.Objects.Types;
1112
using osu.Game.Rulesets.Osu.Objects;
1213
using osu.Game.Rulesets.Osu.Objects.Drawables;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System;
77
using System.Collections.Generic;
88
using System.Diagnostics;
9-
using System.Linq;
109
using osu.Framework.Allocation;
1110
using osu.Framework.Bindables;
1211
using osu.Framework.Graphics;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ protected override void LoadSamples()
166166

167167
// HitSampleInfo : ISampleInfo (reference type) — array covariance lets us cast directly,
168168
// avoiding a second array allocation from .Cast<ISampleInfo>().ToArray().
169-
Samples.Samples = (ISampleInfo[])HitObject.TailSamples.ToArray();
170-
slidingSample.Samples = (ISampleInfo[])HitObject.CreateSlidingSamples().ToArray();
169+
Samples.Samples = HitObject.TailSamples.ToArray();
170+
slidingSample.Samples = HitObject.CreateSlidingSamples().ToArray();
171171
}
172172

173173
public override void StopAllSamples()

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected override void LoadSamples()
143143
{
144144
base.LoadSamples();
145145

146-
spinningSample.Samples = (ISampleInfo[])HitObject.CreateSpinningSamples().ToArray();
146+
spinningSample.Samples = HitObject.CreateSpinningSamples().ToArray();
147147
spinningSample.Frequency.Value = spinning_sample_initial_frequency;
148148

149149
maxBonusSample.Samples = new ISampleInfo[] { new SpinnerBonusMaxSampleInfo(HitObject.CreateHitSampleInfo()) };
@@ -352,7 +352,7 @@ private void updateBonusScore()
352352
while (completedFullSpins.Value != spins)
353353
{
354354
// Manual forward scan avoids allocating a LINQ delegate per spin completion.
355-
DrawableSpinnerTick? tick = null;
355+
DrawableSpinnerTick tick = null;
356356

357357
foreach (var t in ticks)
358358
{

osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics;
7-
using System.Linq;
87
using osu.Framework.Allocation;
98
using osu.Framework.Graphics;
109
using osu.Framework.Input;
@@ -95,8 +94,7 @@ public void PostProcessHeadJudgement(DrawableSliderHead head)
9594

9695
foreach (var nestedObj in slider.NestedHitObjects)
9796
{
98-
var nested = nestedObj as DrawableOsuHitObject;
99-
if (nested == null) continue;
97+
if (nestedObj is not DrawableOsuHitObject nested) continue;
10098

10199
// Skip nested objects that are already judged.
102100
if (nested.Judged)
@@ -122,8 +120,7 @@ public void PostProcessHeadJudgement(DrawableSliderHead head)
122120

123121
foreach (var nestedObj in slider.NestedHitObjects)
124122
{
125-
var nested = nestedObj as DrawableOsuHitObject;
126-
if (nested == null) continue;
123+
if (nestedObj is not DrawableOsuHitObject nested) continue;
127124

128125
// Skip nested objects that are already judged.
129126
if (nested.Judged)

0 commit comments

Comments
 (0)