diff --git a/src/rust/core/songs.rs b/src/rust/core/songs.rs index 1f4cf28..410e72a 100644 --- a/src/rust/core/songs.rs +++ b/src/rust/core/songs.rs @@ -1,11 +1,11 @@ -use std::{collections::HashMap, mem::replace, path::PathBuf}; +use std::{collections::HashMap, path::PathBuf}; use color_eyre::eyre::{eyre, Result}; use sqlx::query; use tracing::{debug, error}; use crate::{ - model::{Model, Modeling}, + model::Model, slides::{Background, TextAlignment}, }; @@ -23,7 +23,7 @@ pub struct Song { pub font_size: Option, } -const VERSE_KEYWORDS: [&'static str; 24] = [ +const VERSE_KEYWORDS: [&str; 24] = [ "Verse 1", "Verse 2", "Verse 3", "Verse 4", "Verse 5", "Verse 6", "Verse 7", "Verse 8", "Chorus 1", "Chorus 2", "Chorus 3", "Chorus 4", "Bridge 1", "Bridge 2", "Bridge 3", "Bridge 4", @@ -104,7 +104,7 @@ impl Song { for verse in verse_order.unwrap_or_default() { let mut verse_name = ""; debug!(verse = verse); - for word in VERSE_KEYWORDS.clone() { + for word in VERSE_KEYWORDS { let end_verse = verse.get(1..2).unwrap_or_default(); let beg_verse = diff --git a/src/rust/core/videos.rs b/src/rust/core/videos.rs index fead75d..26405cf 100644 --- a/src/rust/core/videos.rs +++ b/src/rust/core/videos.rs @@ -1,11 +1,6 @@ use crate::model::Model; -use crate::model::Modeling; -use color_eyre::eyre::eyre; -use color_eyre::eyre::Result; -use sqlx::query; use sqlx::query_as; use tracing::error; -use std::mem::replace; use std::path::PathBuf; #[derive(Clone, Debug, Default, PartialEq)]