From 8ff09e66baefdc2042a15ec4593ea1fbdb1e5893 Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sat, 24 Aug 2024 15:10:54 +0200
Subject: [PATCH] Update rust toolchain to 1.80 (#180)

Closes #179

Reviewed-on: https://git.thenineworlds.net/wojtek/musichoard/pulls/180
---
 .gitea/images/Dockerfile          | 2 +-
 .gitea/workflows/gitea-ci.yaml    | 4 ++--
 build.rs                          | 3 ++-
 src/external/library/beets/mod.rs | 6 +-----
 src/tui/event.rs                  | 4 +---
 src/tui/handler.rs                | 2 --
 src/tui/listener.rs               | 4 +---
 src/tui/ui.rs                     | 4 ++--
 8 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.gitea/images/Dockerfile b/.gitea/images/Dockerfile
index 08c03a3..f460b68 100644
--- a/.gitea/images/Dockerfile
+++ b/.gitea/images/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.79
+FROM docker.io/library/rust:1.80
 
 RUN rustup component add \
   clippy \
diff --git a/.gitea/workflows/gitea-ci.yaml b/.gitea/workflows/gitea-ci.yaml
index 1365757..0af064c 100644
--- a/.gitea/workflows/gitea-ci.yaml
+++ b/.gitea/workflows/gitea-ci.yaml
@@ -13,7 +13,7 @@ env:
 jobs:
   build_and_test:
     name: Build and Test
-    container: docker.io/drrobot/musichoard-ci:rust-1.79
+    container: docker.io/drrobot/musichoard-ci:rust-1.80
     env:
       BEETSDIR: ./
       LLVM_PROFILE_FILE: target/debug/profraw/musichoard-%p-%m.profraw
@@ -48,7 +48,7 @@ jobs:
 
   lint:
     name: Lint
-    container: docker.io/drrobot/musichoard-ci:rust-1.75
+    container: docker.io/drrobot/musichoard-ci:rust-1.80
     steps:
       - uses: actions/checkout@v3
       - run: cargo clippy --no-default-features --all-targets -- -D warnings
diff --git a/build.rs b/build.rs
index 9936968..03e3310 100644
--- a/build.rs
+++ b/build.rs
@@ -1,5 +1,6 @@
 fn main() {
+    println!("cargo::rustc-check-cfg=cfg(nightly)");
     if let Some(true) = version_check::is_feature_flaggable() {
-        println!("cargo:rustc-cfg=nightly");
+        println!("cargo::rustc-cfg=nightly");
     }
 }
diff --git a/src/external/library/beets/mod.rs b/src/external/library/beets/mod.rs
index 107df2f..e157029 100644
--- a/src/external/library/beets/mod.rs
+++ b/src/external/library/beets/mod.rs
@@ -159,11 +159,7 @@ impl<BLE: IBeetsLibraryExecutor> BeetsLibrary<BLE> {
             let album_title = split[5].to_string();
             let track_number = split[6].parse::<u32>()?;
             let track_title = split[7].to_string();
-            let track_artist = split[8]
-                .to_string()
-                .split("; ")
-                .map(|s| s.to_owned())
-                .collect();
+            let track_artist = split[8].split("; ").map(|s| s.to_owned()).collect();
             let track_format = match str_to_format(split[9].to_string().as_str()) {
                 Some(format) => format,
                 None => return Err(Error::Invalid(line.to_string())),
diff --git a/src/tui/event.rs b/src/tui/event.rs
index 494357f..8143c29 100644
--- a/src/tui/event.rs
+++ b/src/tui/event.rs
@@ -1,4 +1,4 @@
-use crossterm::event::{KeyEvent, MouseEvent};
+use crossterm::event::KeyEvent;
 use std::fmt;
 use std::sync::mpsc;
 
@@ -36,8 +36,6 @@ impl From<mpsc::RecvError> for EventError {
 #[derive(Clone, Copy, Debug)]
 pub enum Event {
     Key(KeyEvent),
-    Mouse(MouseEvent),
-    Resize(u16, u16),
 }
 
 pub struct EventChannel {
diff --git a/src/tui/handler.rs b/src/tui/handler.rs
index 3e06caf..038e93e 100644
--- a/src/tui/handler.rs
+++ b/src/tui/handler.rs
@@ -41,8 +41,6 @@ impl<APP: IAppInteract> IEventHandler<APP> for EventHandler {
     fn handle_next_event(&self, mut app: APP) -> Result<APP, EventError> {
         match self.events.recv()? {
             Event::Key(key_event) => app = Self::handle_key_event(app, key_event),
-            Event::Mouse(_) => {}
-            Event::Resize(_, _) => {}
         };
         Ok(app)
     }
diff --git a/src/tui/listener.rs b/src/tui/listener.rs
index 404c03e..1bcbbe2 100644
--- a/src/tui/listener.rs
+++ b/src/tui/listener.rs
@@ -33,9 +33,7 @@ impl IEventListener for EventListener {
                     Ok(event) => {
                         if let Err(err) = match event {
                             CrosstermEvent::Key(e) => self.events.send(Event::Key(e)),
-                            CrosstermEvent::Mouse(e) => self.events.send(Event::Mouse(e)),
-                            CrosstermEvent::Resize(w, h) => self.events.send(Event::Resize(w, h)),
-                            _ => unimplemented!(),
+                            _ => Ok(()),
                         } {
                             return err;
                         }
diff --git a/src/tui/ui.rs b/src/tui/ui.rs
index 314f7f2..c066da3 100644
--- a/src/tui/ui.rs
+++ b/src/tui/ui.rs
@@ -231,13 +231,13 @@ impl<'a> ArtistOverlay<'a> {
         let indent = format!("\n{item_indent}");
         let list = vec
             .iter()
-            .map(|(k, v)| format!("{k}: {}", Self::vec_to_string(v, list_indent)))
+            .map(|(k, v)| format!("{k}: {}", Self::slice_to_string(v, list_indent)))
             .collect::<Vec<String>>()
             .join(&indent);
         format!("{indent}{list}")
     }
 
-    fn vec_to_string<S: AsRef<str>>(vec: &Vec<S>, indent: &str) -> String {
+    fn slice_to_string<S: AsRef<str>>(vec: &[S], indent: &str) -> String {
         if vec.len() < 2 {
             vec.first()
                 .map(|item| item.as_ref())