make clippy happy

Ivan-1F · Ivan-1F · commit 5d2048a62669 · 2024-05-15T23:19:01.000+08:00
diff --git a/src/chart/beat.rs b/src/chart/beat.rs
@@ -25,15 +25,15 @@ impl Beat {
     pub const ONE: Self = Beat(1, Rational32::ZERO);
 }
 
-impl Into<f32> for Beat {
-    fn into(self) -> f32 {
-        self.0 as f32 + *self.1.numer() as f32 / *self.1.denom() as f32
+impl From<Beat> for f32 {
+    fn from(val: Beat) -> Self {
+        val.0 as f32 + *val.1.numer() as f32 / *val.1.denom() as f32
     }
 }
 
-impl Into<Rational32> for Beat {
-    fn into(self) -> Rational32 {
-        Rational32::new(self.0 * self.1.denom() + self.1.numer(), self.denom())
+impl From<Beat> for Rational32 {
+    fn from(val: Beat) -> Self {
+        Rational32::new(val.0 * val.1.denom() + val.1.numer(), val.denom())
     }
 }
 
@@ -96,16 +96,16 @@ impl PartialEq for Beat {
 impl Eq for Beat {}
 
 impl PartialOrd for Beat {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        match self.0.partial_cmp(&other.0) {
-            Some(core::cmp::Ordering::Equal) => self.1.partial_cmp(&other.1),
-            ord => ord,
-        }
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
     }
 }
 
 impl Ord for Beat {
     fn cmp(&self, other: &Self) -> Ordering {
-        self.partial_cmp(other).unwrap()
+        match self.0.cmp(&other.0) {
+            Ordering::Equal => self.1.cmp(&other.1),
+            ord => ord,
+        }
     }
 }
diff --git a/src/chart/note.rs b/src/chart/note.rs
@@ -21,12 +21,12 @@ pub struct Note {
 
 impl Note {
     pub fn new(kind: NoteKind, above: bool, beat: Beat, x: f32) -> Self {
-        return Self {
+        Self {
             kind,
             above,
             beat,
             x,
-        };
+        }
     }
 }
 
diff --git a/src/editing/create_note.rs b/src/editing/create_note.rs
@@ -11,6 +11,7 @@ use crate::{
     timing::BpmList,
 };
 
+#[allow(clippy::too_many_arguments)]
 pub fn create_note_system(
     mut commands: Commands,
     timeline: Timeline,
diff --git a/src/exporter/phichain.rs b/src/exporter/phichain.rs
@@ -25,9 +25,9 @@ impl Exporter for PhiChainExporter {
             let mut events: Vec<LineEvent> = vec![];
             for child in children.iter() {
                 if let Ok(note) = note_query.get(world, *child) {
-                    notes.push(note.clone());
+                    notes.push(*note);
                 } else if let Ok(event) = event_query.get(world, *child) {
-                    events.push(event.clone());
+                    events.push(*event);
                 }
             }
             chart.lines.push(LineWrapper(notes, events));
diff --git a/src/home.rs b/src/home.rs
@@ -132,7 +132,7 @@ fn handle_select_illustration_system(
         if !matches!(kind, PickingKind::SelectIllustration) {
             continue;
         }
-        form.illustration = path.clone();
+        form.illustration.clone_from(path);
     }
 }
 
@@ -144,7 +144,7 @@ fn handle_select_music_system(
         if !matches!(kind, PickingKind::SelectMusic) {
             continue;
         }
-        form.music = path.clone();
+        form.music.clone_from(path);
     }
 }
 
diff --git a/src/loader/official.rs b/src/loader/official.rs
@@ -138,7 +138,7 @@ impl Loader for OfficialLoader {
                                 kind,
                                 above,
                                 t(note.time),
-                                note.x / 18.0 * CANVAS_WIDTH as f32,
+                                note.x / 18.0 * CANVAS_WIDTH,
                             )))
                             .id();
                         note_ids.push(note_id);
@@ -197,9 +197,8 @@ impl Loader for OfficialLoader {
                 })
                 .id();
 
-            match first_line_id {
-                None => first_line_id = Some(id),
-                _ => {}
+            if first_line_id.is_none() {
+                first_line_id = Some(id)
             }
         }
         commands.insert_resource(SelectedLine(first_line_id.unwrap()));
diff --git a/src/loader/phichain.rs b/src/loader/phichain.rs
@@ -31,9 +31,8 @@ impl Loader for PhiChainLoader {
                 })
                 .id();
 
-            match first_line_id {
-                None => first_line_id = Some(id),
-                _ => {}
+            if first_line_id.is_none() {
+                first_line_id = Some(id)
             }
         }
 
diff --git a/src/main.rs b/src/main.rs
@@ -71,7 +71,7 @@ fn main() {
         .add_plugins(MiscPlugin)
         .add_plugins(TabPlugin)
         .add_plugins(EditingPlugin)
-        .add_plugins(FrameTimeDiagnosticsPlugin::default())
+        .add_plugins(FrameTimeDiagnosticsPlugin)
         .add_plugins(AssetsPlugin)
         .add_plugins(TranslationPlugin)
         .add_plugins(NotificationPlugin)
diff --git a/src/tab/game/core.rs b/src/tab/game/core.rs
@@ -242,12 +242,12 @@ struct SpeedEvent {
 
 impl SpeedEvent {
     fn new(start_time: f32, end_time: f32, start_value: f32, end_value: f32) -> Self {
-        return Self {
+        Self {
             start_time,
             end_time,
             start_value,
             end_value,
-        };
+        }
     }
 }
 
@@ -257,16 +257,13 @@ fn calculate_speed_events_system(
     bpm_list: Res<BpmList>,
 ) {
     for (event, entity) in &query {
-        match event.kind {
-            LineEventKind::Speed => {
-                commands.entity(entity).insert(SpeedEvent::new(
-                    bpm_list.time_at(event.start_beat),
-                    bpm_list.time_at(event.end_beat),
-                    event.start,
-                    event.end,
-                ));
-            }
-            _ => {}
+        if let LineEventKind::Speed = event.kind {
+            commands.entity(entity).insert(SpeedEvent::new(
+                bpm_list.time_at(event.start_beat),
+                bpm_list.time_at(event.end_beat),
+                event.start,
+                event.end,
+            ));
         }
     }
 }
diff --git a/src/tab/game/ui.rs b/src/tab/game/ui.rs
@@ -85,7 +85,6 @@ fn setup_combo_ui_system(mut commands: Commands, asset_server: Res<AssetServer>)
                                     font: asset_server.load("font/phigros.ttf"),
                                     font_size: 20.0,
                                     color: Color::WHITE,
-                                    ..default()
                                 },
                             ),
                             ..default()
@@ -101,7 +100,6 @@ fn setup_combo_ui_system(mut commands: Commands, asset_server: Res<AssetServer>)
                                     font: asset_server.load("font/phigros.ttf"),
                                     font_size: 10.0,
                                     color: Color::WHITE,
-                                    ..default()
                                 },
                             ),
                             ..default()
@@ -138,7 +136,6 @@ fn spawn_score_ui_system(mut commands: Commands, asset_server: Res<AssetServer>)
                             font: asset_server.load("font/phigros.ttf"),
                             font_size: 10.0,
                             color: Color::WHITE,
-                            ..default()
                         },
                     ),
                     ..default()
diff --git a/src/tab/mod.rs b/src/tab/mod.rs
@@ -33,7 +33,7 @@ impl TabRegistry {
         if let Some(tab) = self.0.get_mut(tab) {
             tab.run(world, ui);
         } else {
-            ui.colored_label(egui::Color32::RED, format!("Tab does not exist."));
+            ui.colored_label(egui::Color32::RED, "Tab does not exist.".to_string());
         }
     }
 }
diff --git a/src/tab/timeline.rs b/src/tab/timeline.rs
@@ -24,6 +24,7 @@ impl Plugin for TimelineTabPlugin {
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn timeline_ui_system(
     In(ui): In<&mut Ui>,
     selected_line_query: Res<SelectedLine>,
diff --git a/src/translation.rs b/src/translation.rs
@@ -12,10 +12,10 @@ impl Plugin for TranslationPlugin {
 }
 
 fn load_translations(mut storage: ResMut<TranslationStorage>) {
-    let file = std::fs::File::open("lang/meta/languages.json")
-        .expect(&format!("Failed to load translations"));
+    let file =
+        std::fs::File::open("lang/meta/languages.json").expect("Failed to load translations");
     let languages: Vec<String> =
-        serde_json::from_reader(file).expect(&format!("Failed to load translations"));
+        serde_json::from_reader(file).expect("Failed to load translations");
 
     for language in languages {
         let mapping = load_translation(&language);
@@ -52,9 +52,9 @@ fn flatten(prefix: Option<&str>, value: &Value, result: &mut HashMap<String, Str
 
 fn load_translation(lang: &String) -> HashMap<String, String> {
     let file = std::fs::File::open(format!("lang/{}.yml", lang))
-        .expect(&format!("Failed to load translation: {}", lang));
-    let value: Value =
-        serde_yaml::from_reader(file).expect(&format!("Failed to load translation: {}", lang));
+        .unwrap_or_else(|_| panic!("Failed to load translation: {}", lang));
+    let value: Value = serde_yaml::from_reader(file)
+        .unwrap_or_else(|_| panic!("Failed to load translation: {}", lang));
 
     let mut mapping: HashMap<String, String> = HashMap::new();
     flatten(None, &value, &mut mapping);

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ impl Beat {`
`25`	`25`	`pub const ONE: Self = Beat(1, Rational32::ZERO);`
`26`	`26`	`}`
`27`	`27`
`28`		`-impl Into<f32> for Beat {`
`29`		`- fn into(self) -> f32 {`
`30`		`- self.0 as f32 + self.1.numer() as f32 / self.1.denom() as f32`
	`28`	`+impl From<Beat> for f32 {`
	`29`	`+ fn from(val: Beat) -> Self {`
	`30`	`+ val.0 as f32 + val.1.numer() as f32 / val.1.denom() as f32`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`-impl Into<Rational32> for Beat {`
`35`		`- fn into(self) -> Rational32 {`
`36`		`- Rational32::new(self.0 * self.1.denom() + self.1.numer(), self.denom())`
	`34`	`+impl From<Beat> for Rational32 {`
	`35`	`+ fn from(val: Beat) -> Self {`
	`36`	`+ Rational32::new(val.0 * val.1.denom() + val.1.numer(), val.denom())`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`@@ -96,16 +96,16 @@ impl PartialEq for Beat {`
`96`	`96`	`impl Eq for Beat {}`
`97`	`97`
`98`	`98`	`impl PartialOrd for Beat {`
`99`		`- fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {`
`100`		`- match self.0.partial_cmp(&other.0) {`
`101`		`- Some(core::cmp::Ordering::Equal) => self.1.partial_cmp(&other.1),`
`102`		`- ord => ord,`
`103`		`- }`
	`99`	`+ fn partial_cmp(&self, other: &Self) -> Option<Ordering> {`
	`100`	`+ Some(self.cmp(other))`
`104`	`101`	`}`
`105`	`102`	`}`
`106`	`103`
`107`	`104`	`impl Ord for Beat {`
`108`	`105`	`fn cmp(&self, other: &Self) -> Ordering {`
`109`		`- self.partial_cmp(other).unwrap()`
	`106`	`+ match self.0.cmp(&other.0) {`
	`107`	`+ Ordering::Equal => self.1.cmp(&other.1),`
	`108`	`+ ord => ord,`
	`109`	`+ }`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ pub struct Note {`
`21`	`21`
`22`	`22`	`impl Note {`
`23`	`23`	`pub fn new(kind: NoteKind, above: bool, beat: Beat, x: f32) -> Self {`
`24`		`- return Self {`
	`24`	`+ Self {`
`25`	`25`	`kind,`
`26`	`26`	`above,`
`27`	`27`	`beat,`
`28`	`28`	`x,`
`29`		`- };`
	`29`	`+ }`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ impl Exporter for PhiChainExporter {`
`25`	`25`	`let mut events: Vec<LineEvent> = vec![];`
`26`	`26`	`for child in children.iter() {`
`27`	`27`	`if let Ok(note) = note_query.get(world, *child) {`
`28`		`- notes.push(note.clone());`
	`28`	`+ notes.push(*note);`
`29`	`29`	`} else if let Ok(event) = event_query.get(world, *child) {`
`30`		`- events.push(event.clone());`
	`30`	`+ events.push(*event);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`chart.lines.push(LineWrapper(notes, events));`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ fn handle_select_illustration_system(`
`132`	`132`	`if !matches!(kind, PickingKind::SelectIllustration) {`
`133`	`133`	`continue;`
`134`	`134`	`}`
`135`		`- form.illustration = path.clone();`
	`135`	`+ form.illustration.clone_from(path);`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`@@ -144,7 +144,7 @@ fn handle_select_music_system(`
`144`	`144`	`if !matches!(kind, PickingKind::SelectMusic) {`
`145`	`145`	`continue;`
`146`	`146`	`}`
`147`		`- form.music = path.clone();`
	`147`	`+ form.music.clone_from(path);`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,8 @@ impl Loader for PhiChainLoader {`
`31`	`31`	`})`
`32`	`32`	`.id();`
`33`	`33`
`34`		`- match first_line_id {`
`35`		`- None => first_line_id = Some(id),`
`36`		`- _ => {}`
	`34`	`+ if first_line_id.is_none() {`
	`35`	`+ first_line_id = Some(id)`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ impl TabRegistry {`
`33`	`33`	`if let Some(tab) = self.0.get_mut(tab) {`
`34`	`34`	`tab.run(world, ui);`
`35`	`35`	`} else {`
`36`		`- ui.colored_label(egui::Color32::RED, format!("Tab does not exist."));`
	`36`	`+ ui.colored_label(egui::Color32::RED, "Tab does not exist.".to_string());`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ impl Plugin for TimelineTabPlugin {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
	`27`	`+#[allow(clippy::too_many_arguments)]`
`27`	`28`	`pub fn timeline_ui_system(`
`28`	`29`	`In(ui): In<&mut Ui>,`
`29`	`30`	`selected_line_query: Res<SelectedLine>,`