some cleanup of warnings and fixes from clippy

This commit is contained in:
Chris Cochrun 2024-10-08 12:58:37 -05:00
parent c62bcf8190
commit 362a31581d
2 changed files with 4 additions and 9 deletions

View file

@ -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<i32>,
}
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 =