From ba0519d2507e1e951b9aae3c8acc18f4f23852de Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Thu, 2 Jan 2025 15:18:25 +0100 Subject: [PATCH] Fix imports --- src/core/collection/artist.rs | 5 +---- src/external/database/serde/deserialize.rs | 4 +--- src/external/musicbrainz/api/lookup.rs | 7 ++++--- src/tui/ui/info_state.rs | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/core/collection/artist.rs b/src/core/collection/artist.rs index 71bf781..209148c 100644 --- a/src/core/collection/artist.rs +++ b/src/core/collection/artist.rs @@ -1,17 +1,14 @@ use std::{ collections::HashMap, fmt::{self, Debug, Display}, - mem, }; use crate::core::collection::{ - album::Album, + album::{Album, AlbumLibId}, merge::{Merge, MergeId}, musicbrainz::{MbArtistRef, MbRefOption}, }; -use super::album::AlbumLibId; - /// An artist. #[derive(Clone, Debug, PartialEq, Eq)] pub struct Artist { diff --git a/src/external/database/serde/deserialize.rs b/src/external/database/serde/deserialize.rs index a24f5ab..5cddf35 100644 --- a/src/external/database/serde/deserialize.rs +++ b/src/external/database/serde/deserialize.rs @@ -14,12 +14,10 @@ use crate::{ Collection, Error as CollectionError, }, external::database::serde::common::{ - AlbumLibIdDef, SerdeAlbumPrimaryType, SerdeAlbumSecondaryType, + AlbumLibIdDef, MbRefOptionDef, SerdeAlbumPrimaryType, SerdeAlbumSecondaryType, }, }; -use super::common::MbRefOptionDef; - #[derive(Debug, Deserialize)] pub enum DeserializeDatabase { V20250101(Vec), diff --git a/src/external/musicbrainz/api/lookup.rs b/src/external/musicbrainz/api/lookup.rs index 82197d5..140eded 100644 --- a/src/external/musicbrainz/api/lookup.rs +++ b/src/external/musicbrainz/api/lookup.rs @@ -4,13 +4,14 @@ use url::form_urlencoded; use crate::{ collection::musicbrainz::Mbid, external::musicbrainz::{ - api::{Error, MusicBrainzClient, MB_BASE_URL}, + api::{ + Error, MbArtistMeta, MbReleaseGroupMeta, MusicBrainzClient, SerdeMbArtistMeta, + SerdeMbReleaseGroupMeta, MB_BASE_URL, + }, IMusicBrainzHttp, }, }; -use super::{MbArtistMeta, MbReleaseGroupMeta, SerdeMbArtistMeta, SerdeMbReleaseGroupMeta}; - impl MusicBrainzClient { pub fn lookup_artist( &mut self, diff --git a/src/tui/ui/info_state.rs b/src/tui/ui/info_state.rs index 8a73877..4a99c0a 100644 --- a/src/tui/ui/info_state.rs +++ b/src/tui/ui/info_state.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use musichoard::collection::{album::Album, artist::Artist}; use ratatui::widgets::{ListState, Paragraph}; -use super::display::UiDisplay; +use crate::tui::ui::display::UiDisplay; struct InfoOverlay;