enforce lint groups

added remaining lint enforcements
This commit is contained in:
MaxOhn
2021-11-06 22:30:10 +01:00
parent 65e4ba166a
commit 21dcdeb942
16 changed files with 44 additions and 39 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ pub(crate) struct ObjectParameters<'a> {
impl OsuObject {
#[allow(clippy::too_many_arguments)]
pub(crate) fn new(h: &HitObject, hr: bool, params: &mut ObjectParameters) -> Option<Self> {
pub(crate) fn new(h: &HitObject, hr: bool, params: &mut ObjectParameters<'_>) -> Option<Self> {
let ObjectParameters {
map,
radius,
+2 -2
View File
@@ -31,7 +31,7 @@ impl Skill {
}
#[inline]
pub(crate) fn process(&mut self, curr: &DifficultyObject) {
pub(crate) fn process(&mut self, curr: &DifficultyObject<'_>) {
self.kind.pre_process();
self.curr_section_peak = self.strain_value_at(curr).max(self.curr_section_peak);
self.prev_time = Some(curr.base.time);
@@ -89,7 +89,7 @@ impl Skill {
}
}
pub(crate) fn strain_value_at(&mut self, curr: &DifficultyObject) -> f32 {
pub(crate) fn strain_value_at(&mut self, curr: &DifficultyObject<'_>) -> f32 {
self.curr_strain *= self.kind.strain_decay(curr.delta);
self.curr_strain += self.kind.strain_value_of(curr) * self.kind.skill_multiplier();
+5 -5
View File
@@ -45,7 +45,7 @@ pub(crate) struct FlashlightHistoryEntry {
}
impl From<&DifficultyObject<'_>> for FlashlightHistoryEntry {
fn from(h: &DifficultyObject) -> Self {
fn from(h: &DifficultyObject<'_>) -> Self {
Self {
end_pos: h.base.end_pos(),
is_spinner: h.base.is_spinner(),
@@ -62,7 +62,7 @@ pub(crate) struct SpeedHistoryEntry {
}
impl From<&DifficultyObject<'_>> for SpeedHistoryEntry {
fn from(h: &DifficultyObject) -> Self {
fn from(h: &DifficultyObject<'_>) -> Self {
Self {
is_slider: h.base.is_slider(),
start_time: h.base.time,
@@ -108,7 +108,7 @@ impl SkillKind {
}
}
pub(crate) fn post_process(&mut self, current: &DifficultyObject) {
pub(crate) fn post_process(&mut self, current: &DifficultyObject<'_>) {
match self {
Self::Aim => {}
Self::Flashlight { history, .. } => history.push_front(current.into()),
@@ -116,7 +116,7 @@ impl SkillKind {
}
}
pub(crate) fn strain_value_of(&self, curr: &DifficultyObject) -> f32 {
pub(crate) fn strain_value_of(&self, curr: &DifficultyObject<'_>) -> f32 {
match self {
Self::Aim => {
if curr.base.is_spinner() {
@@ -286,7 +286,7 @@ impl SkillKind {
}
pub(crate) fn calculate_speed_rhythm_bonus(
current: &DifficultyObject,
current: &DifficultyObject<'_>,
history: &VecDeque<SpeedHistoryEntry>,
hit_window: f32,
) -> f32 {
+1 -1
View File
@@ -37,7 +37,7 @@ pub(crate) struct ObjectParameters<'a> {
}
impl OsuObject {
pub(crate) fn new(h: &HitObject, params: &mut ObjectParameters) -> Option<Self> {
pub(crate) fn new(h: &HitObject, params: &mut ObjectParameters<'_>) -> Option<Self> {
let ObjectParameters {
map,
radius,
+2 -2
View File
@@ -30,7 +30,7 @@ impl Skill {
}
}
pub(crate) fn process(&mut self, curr: &DifficultyObject) {
pub(crate) fn process(&mut self, curr: &DifficultyObject<'_>) {
self.kind.pre_process();
self.curr_section_peak = self.strain_value_at(curr).max(self.curr_section_peak);
self.prev_time = Some(curr.base.time);
@@ -88,7 +88,7 @@ impl Skill {
}
}
pub(crate) fn strain_value_at(&mut self, curr: &DifficultyObject) -> f32 {
pub(crate) fn strain_value_at(&mut self, curr: &DifficultyObject<'_>) -> f32 {
self.curr_strain *= self.kind.strain_decay(curr.delta);
self.curr_strain += self.kind.strain_value_of(curr) * self.kind.skill_multiplier();
+5 -5
View File
@@ -45,7 +45,7 @@ pub(crate) struct FlashlightHistoryEntry {
}
impl From<&DifficultyObject<'_>> for FlashlightHistoryEntry {
fn from(h: &DifficultyObject) -> Self {
fn from(h: &DifficultyObject<'_>) -> Self {
Self {
end_pos: h.base.end_pos(),
is_spinner: h.base.is_spinner(),
@@ -62,7 +62,7 @@ pub(crate) struct SpeedHistoryEntry {
}
impl From<&DifficultyObject<'_>> for SpeedHistoryEntry {
fn from(h: &DifficultyObject) -> Self {
fn from(h: &DifficultyObject<'_>) -> Self {
Self {
is_slider: h.base.is_slider(),
start_time: h.base.time,
@@ -108,7 +108,7 @@ impl SkillKind {
}
}
pub(crate) fn post_process(&mut self, current: &DifficultyObject) {
pub(crate) fn post_process(&mut self, current: &DifficultyObject<'_>) {
match self {
Self::Aim => {}
Self::Flashlight { history, .. } => history.push_front(current.into()),
@@ -116,7 +116,7 @@ impl SkillKind {
}
}
pub(crate) fn strain_value_of(&self, curr: &DifficultyObject) -> f32 {
pub(crate) fn strain_value_of(&self, curr: &DifficultyObject<'_>) -> f32 {
match self {
Self::Aim => {
if curr.base.is_spinner() {
@@ -286,7 +286,7 @@ impl SkillKind {
}
pub(crate) fn calculate_speed_rhythm_bonus(
current: &DifficultyObject,
current: &DifficultyObject<'_>,
history: &VecDeque<SpeedHistoryEntry>,
hit_window: f32,
) -> f32 {
@@ -31,7 +31,7 @@ impl Skill {
}
#[inline]
pub(crate) fn process(&mut self, curr: &DifficultyObject) {
pub(crate) fn process(&mut self, curr: &DifficultyObject<'_>) {
self.kind.pre_process();
self.curr_section_peak = self.strain_value_at(curr).max(self.curr_section_peak);
self.prev_time = Some(curr.base.time);
@@ -89,7 +89,7 @@ impl Skill {
}
}
pub(crate) fn strain_value_at(&mut self, curr: &DifficultyObject) -> f32 {
pub(crate) fn strain_value_at(&mut self, curr: &DifficultyObject<'_>) -> f32 {
self.curr_strain *= self.kind.strain_decay(curr.delta);
self.curr_strain += self.kind.strain_value_of(curr) * self.kind.skill_multiplier();
@@ -45,7 +45,7 @@ pub(crate) struct FlashlightHistoryEntry {
}
impl From<&DifficultyObject<'_>> for FlashlightHistoryEntry {
fn from(h: &DifficultyObject) -> Self {
fn from(h: &DifficultyObject<'_>) -> Self {
Self {
end_pos: h.base.pos,
is_spinner: h.base.is_spinner,
@@ -62,7 +62,7 @@ pub(crate) struct SpeedHistoryEntry {
}
impl From<&DifficultyObject<'_>> for SpeedHistoryEntry {
fn from(h: &DifficultyObject) -> Self {
fn from(h: &DifficultyObject<'_>) -> Self {
Self {
is_slider: h.base.is_slider,
start_time: h.base.time,
@@ -108,7 +108,7 @@ impl SkillKind {
}
}
pub(crate) fn post_process(&mut self, current: &DifficultyObject) {
pub(crate) fn post_process(&mut self, current: &DifficultyObject<'_>) {
match self {
Self::Aim => {}
Self::Flashlight { history, .. } => history.push_front(current.into()),
@@ -116,7 +116,7 @@ impl SkillKind {
}
}
pub(crate) fn strain_value_of(&self, curr: &DifficultyObject) -> f32 {
pub(crate) fn strain_value_of(&self, curr: &DifficultyObject<'_>) -> f32 {
match self {
Self::Aim => {
if curr.base.is_spinner {
@@ -282,7 +282,7 @@ impl SkillKind {
}
pub(crate) fn calculate_speed_rhythm_bonus(
current: &DifficultyObject,
current: &DifficultyObject<'_>,
history: &VecDeque<SpeedHistoryEntry>,
hit_window: f32,
) -> f32 {