diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index e12ff28..9a14f2d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -19,15 +19,6 @@ jobs: # - uses: actions-rust-lang/setup-rust-toolchain@v1 # - run: cargo test - #fmt: - # name: Rustfmt - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - uses: actions-rust-lang/setup-rust-toolchain@v1 - # - run: rustup component add rustfmt - # - run: cargo fmt --all -- --check - clippy: name: Clippy runs-on: ubuntu-latest diff --git a/src/ui/gui/components/side_nav/context_menu.rs b/src/ui/gui/components/side_nav/context_menu.rs index 7bce72d..5f89497 100644 --- a/src/ui/gui/components/side_nav/context_menu.rs +++ b/src/ui/gui/components/side_nav/context_menu.rs @@ -42,8 +42,8 @@ impl ComponentContextMenu for ContextMenu { if ui.button(RichText::new("Delete").color(Color32::RED)).clicked() { let w = gui.windows.get_window::(WindowIndex::Confirm); w.set_message( - &"side_nav_playlist_manifest_delete", - &"This will delete the playlist from the manifest file. This is NOT reversible", + "side_nav_playlist_manifest_delete", + "This will delete the playlist from the manifest file. This is NOT reversible", &[playlist_name.clone()] ); gui.windows.open(WindowIndex::Confirm, true); diff --git a/src/ui/gui/components/song_list/context_menu.rs b/src/ui/gui/components/song_list/context_menu.rs index b64892e..a291657 100644 --- a/src/ui/gui/components/song_list/context_menu.rs +++ b/src/ui/gui/components/song_list/context_menu.rs @@ -84,8 +84,8 @@ impl ComponentContextMenu for ContextMenu { if ui.button(RichText::new("Delete").color(Color32::RED)).clicked() { let w = gui.windows.get_window::(WindowIndex::Confirm); w.set_message( - &"song_list_song_manifest_delete", - &"This will delete the song from the manifest file. This is NOT reversible", + "song_list_song_manifest_delete", + "This will delete the song from the manifest file. This is NOT reversible", &[data.playlist_name().clone(), data.song_name().clone()] ); gui.windows.open(WindowIndex::Confirm, true); diff --git a/src/ui/gui/mod.rs b/src/ui/gui/mod.rs index 2d6db98..82cb3f2 100644 --- a/src/ui/gui/mod.rs +++ b/src/ui/gui/mod.rs @@ -53,7 +53,7 @@ impl Gui { pub fn throw_error(&mut self, text: S) { let w = self.windows.get_window::(WindowIndex::Error); - w.set_error_message(&text); + w.set_error_message(text); self.windows.open(WindowIndex::Error, true); } } diff --git a/src/ui/gui/windows/confirm.rs b/src/ui/gui/windows/confirm.rs index 1a14654..91c8cc6 100644 --- a/src/ui/gui/windows/confirm.rs +++ b/src/ui/gui/windows/confirm.rs @@ -41,7 +41,7 @@ impl Window for ConfirmW { } impl ConfirmW { - pub fn set_message(&mut self, new_id: &S, text: &S, data: &[String]) { + pub fn set_message(&mut self, new_id: S, text: S, data: &[String]) { self.text = text.to_string(); self.id = new_id.to_string(); self.data = data.to_vec(); diff --git a/src/ui/gui/windows/error.rs b/src/ui/gui/windows/error.rs index 406cc5d..04cd3b2 100644 --- a/src/ui/gui/windows/error.rs +++ b/src/ui/gui/windows/error.rs @@ -27,7 +27,7 @@ impl Window for GuiError { } impl GuiError { - pub fn set_error_message(&mut self, text: &S) { + pub fn set_error_message(&mut self, text: S) { self.text = text.to_string(); } }