wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Replace as many Box<dyn Trait> with generics as possible #32

Merged
wojtek merged 7 commits from 31---replace-as-many-Box-dyn-trait-with-generics-as-possible into main 2023-04-13 15:29:14 +02:00
Conversation 0 Commits 7 Files Changed 11 +9 -9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ea736cebed - Show all commits

16
src/collection/mod.rs
View File

@ -56,15 +56,15 @@ pub trait CollectionManager {
/// The collection manager. It is responsible for pulling information from both the library and the /// The collection manager. It is responsible for pulling information from both the library and the
/// database, ensuring its consistent and writing back any changes. /// database, ensuring its consistent and writing back any changes.
pub struct MhCollectionManager<L> { pub struct MhCollectionManager<L, D> {
library: L, library: L,
database: Box<dyn Database + Send + Sync>, database: D,
collection: Collection, collection: Collection,
} }
impl<L: Library> MhCollectionManager<L> { impl<L: Library, D: Database> MhCollectionManager<L, D> {
/// Create a new [`CollectionManager`] with the provided [`Library`] and [`Database`]. /// Create a new [`CollectionManager`] with the provided [`Library`] and [`Database`].
pub fn new(library: L, database: Box<dyn Database + Send + Sync>) -> Self { pub fn new(library: L, database: D) -> Self {
MhCollectionManager { MhCollectionManager {
library, library,
database, database,
@ -73,7 +73,7 @@ impl<L: Library> MhCollectionManager<L> {
} }
} }
impl<L: Library> CollectionManager for MhCollectionManager<L> { impl<L: Library, D: Database> CollectionManager for MhCollectionManager<L, D> {
fn rescan_library(&mut self) -> Result<(), Error> { fn rescan_library(&mut self) -> Result<(), Error> {
self.collection = self.library.list(&Query::default())?; self.collection = self.library.list(&Query::default())?;
Ok(()) Ok(())
@ -124,7 +124,7 @@ mod tests {
.times(1) .times(1)
.return_once(|_| database_result); .return_once(|_| database_result);
let mut collection_manager = MhCollectionManager::new(library, Box::new(database)); let mut collection_manager = MhCollectionManager::new(library, database);
collection_manager.rescan_library().unwrap(); collection_manager.rescan_library().unwrap();
assert_eq!(collection_manager.get_collection(), &*COLLECTION); assert_eq!(collection_manager.get_collection(), &*COLLECTION);
@ -143,7 +143,7 @@ mod tests {
.times(1) .times(1)
.return_once(|_| library_result); .return_once(|_| library_result);
let mut collection_manager = MhCollectionManager::new(library, Box::new(database)); let mut collection_manager = MhCollectionManager::new(library, database);
let actual_err = collection_manager.rescan_library().unwrap_err(); let actual_err = collection_manager.rescan_library().unwrap_err();
let expected_err = Error::LibraryError( let expected_err = Error::LibraryError(
@ -166,7 +166,7 @@ mod tests {
.times(1) .times(1)
.return_once(|_| database_result); .return_once(|_| database_result);
let mut collection_manager = MhCollectionManager::new(library, Box::new(database)); let mut collection_manager = MhCollectionManager::new(library, database);
let actual_err = collection_manager.save_to_database().unwrap_err(); let actual_err = collection_manager.save_to_database().unwrap_err();
let expected_err = let expected_err =

2
src/main.rs
View File

@ -49,7 +49,7 @@ fn main() {
&opt.database_file_path, &opt.database_file_path,
))); )));
let collection_manager = MhCollectionManager::new(beets, Box::new(database)); let collection_manager = MhCollectionManager::new(beets, database);
// Initialize the terminal user interface. // Initialize the terminal user interface.
let backend = CrosstermBackend::new(io::stdout()); let backend = CrosstermBackend::new(io::stdout());