Code cleanup

src/song.rs

@@ -114,25 +114,18 @@ impl Song {
                 let p = std::path::Path::new(&song_path);
                 if p.exists() {
                     match std::fs::remove_file(&p) {
-                        Ok(_) => {
+                        Ok(_) => Ok(()),
-                            Ok(())
+                        Err(err) => Err(err),
-                        }
-                        Err(err) => {
-                            Err(err)
-                        }
                     }
                 } else {
                     Ok(())
                 }
             }
-            Err(err) => {
+            Err(err) => Err(err),
-                Err(err)
-            }
         }
     }
 }
 
-
 /// Generates a filename. In order to save a song to the filesystem, the song must have
 /// a directory and filename
 pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String {

tests/tests.rs

@@ -132,15 +132,12 @@ mod song_tests {
         };
 
         match song::io::copy_song(&song, &mut copied_song) {
-            Ok(_) => {
+            Ok(_) => match copied_song.remove_from_filesystem() {
-                match copied_song.remove_from_filesystem() {
+                Ok(_) => {}
-                    Ok(_) => {
-                    }
                 Err(err) => {
                     assert!(false, "Error: {err:?}")
                 }
-                }
+            },
-            }
             Err(err) => {
                 assert!(false, "Error: {err:?}")
             }