src/song.rs

@@ -152,16 +152,18 @@ impl Song {
         }
     }
 
-    pub fn generate_filename(&self, typ: types::Types, randomize: bool) -> String {
+    pub fn generate_filename(&self, typ: types::MusicTypes, randomize: bool) -> String {
         let mut filename: String = String::new();
         let filename_len = 10;
 
         let file_extension = match typ {
-            types::Types::DefaultMusicExtension => String::from(constants::DEFAULTMUSICEXTENSION),
+            types::MusicTypes::DefaultMusicExtension => {
+                String::from(constants::DEFAULTMUSICEXTENSION)
+            }
 
-            types::Types::WavExtension => String::from(constants::WAVEXTENSION),
+            types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION),
-            types::Types::FlacExtension => String::from(constants::FLACEXTENSION),
+            types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION),
-            types::Types::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
+            types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
         };
 
         if randomize {

src/types.rs

@@ -1,5 +1,4 @@
-
+pub enum MusicTypes {
-pub enum Types {
     DefaultMusicExtension,
     WavExtension,
     FlacExtension,