use cmp methods
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
use std::cmp;
|
||||
|
||||
use crate::{
|
||||
any::difficulty::skills::Skill,
|
||||
mania::{object::ObjectParams, ManiaBeatmap},
|
||||
@@ -159,7 +161,7 @@ impl Iterator for ManiaGradualDifficulty {
|
||||
.zip(self.objects_is_circle.iter().skip(1))
|
||||
.skip(self.idx.saturating_sub(1));
|
||||
|
||||
let mut take = n.min(self.len().saturating_sub(1));
|
||||
let mut take = cmp::min(n, self.len().saturating_sub(1));
|
||||
|
||||
// The first note has no difficulty object
|
||||
if self.idx == 0 && take > 0 {
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
use std::cmp;
|
||||
|
||||
use crate::{
|
||||
any::difficulty::{mode::ModeDifficulty, skills::Skill},
|
||||
mania::{
|
||||
@@ -19,9 +21,10 @@ pub fn difficulty(
|
||||
difficulty: &ModeDifficulty,
|
||||
converted: &ManiaBeatmap<'_>,
|
||||
) -> ManiaDifficultyAttributes {
|
||||
let n_objects = difficulty
|
||||
.get_passed_objects()
|
||||
.min(converted.map.hit_objects.len()) as u32;
|
||||
let n_objects = cmp::min(
|
||||
difficulty.get_passed_objects(),
|
||||
converted.map.hit_objects.len(),
|
||||
) as u32;
|
||||
|
||||
let values = DifficultyValues::calculate(difficulty, converted);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user