made clippy happy

This commit is contained in:
MaxOhn
2022-06-21 07:38:50 +02:00
parent 80fe8aa238
commit d0db4a1775
6 changed files with 25 additions and 32 deletions
+1 -1
View File
@@ -235,7 +235,7 @@ fn calculate_skills(params: OsuStars<'_>) -> (Skills, OsuDifficultyAttributes) {
clock_rate,
} = params;
let take = passed_objects.unwrap_or_else(|| map.hit_objects.len());
let take = passed_objects.unwrap_or(map.hit_objects.len());
let clock_rate = clock_rate.unwrap_or_else(|| mods.clock_rate());
let map_attributes = map.attributes().mods(mods);
+3 -9
View File
@@ -176,9 +176,7 @@ impl<'map> OsuPP<'map> {
/// Be sure to set `misses` beforehand!
/// In case of a partial play, be also sure to set `passed_objects` beforehand!
pub fn accuracy(mut self, acc: f64) -> Self {
let n_objects = self
.passed_objects
.unwrap_or_else(|| self.map.hit_objects.len());
let n_objects = self.passed_objects.unwrap_or(self.map.hit_objects.len());
let mut acc = acc / 100.0;
@@ -241,9 +239,7 @@ impl<'map> OsuPP<'map> {
let mut n100 = self.n100;
let mut n50 = self.n50;
let n_objects = self
.passed_objects
.unwrap_or_else(|| self.map.hit_objects.len());
let n_objects = self.passed_objects.unwrap_or(self.map.hit_objects.len());
if let Some(acc) = self.acc {
let n300 = n300.unwrap_or(0);
@@ -267,9 +263,7 @@ impl<'map> OsuPP<'map> {
effective_misses,
}
} else {
let n_objects = self
.passed_objects
.unwrap_or_else(|| self.map.hit_objects.len());
let n_objects = self.passed_objects.unwrap_or(self.map.hit_objects.len());
let remaining = n_objects
.saturating_sub(n300.unwrap_or(0))