merge branch 'podwriter-master'

Cargo.toml

@@ -14,8 +14,7 @@ version = "0.9.0"
 chrono = "0.4.38"
 regex = "1.10.5"
 roxmltree = "0.20.0"
-strum = "0.26.3"
-strum_macros = "0.26.4"
+strum = { version = "0.26", features = ["derive"] }
 time = { version = "0.3.36" }
 url = "2.5.2"
 

src/itunes.rs

@@ -1,7 +1,7 @@
 use crate::strings::Url;
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 mod category;
 pub use category::{CategoryName, SubcategoryName};

src/itunes/category.rs

@@ -2,8 +2,7 @@ use crate::utils;
 use crate::Other;
 use std::fmt;
 use std::str::FromStr;
-use strum::EnumProperty;
-use strum_macros::{EnumIter, EnumProperty};
+use strum::{EnumIter, EnumProperty};
 
 /// Apple Podcasts podcast category names.
 #[derive(Debug, PartialEq, Eq, EnumProperty, EnumIter)]

src/language.rs

@@ -1,7 +1,6 @@
 use crate::Other;
 use std::str::FromStr;
-use strum::{EnumProperty, IntoEnumIterator};
-use strum_macros::{Display, EnumIter, EnumProperty, EnumString};
+use strum::{Display, EnumIter, EnumProperty, EnumString, IntoEnumIterator};
 
 /// Used for deserializing languages.
 ///

src/mime.rs

@@ -1,7 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum::EnumProperty;
-use strum_macros::{EnumIter, EnumProperty};
+use strum::{EnumIter, EnumProperty};
 
 /// Used for deserializing mime types of enclosures.
 #[derive(Debug, PartialEq, Eq, EnumProperty, EnumIter)]

src/podcast/alternate_enclosure.rs

@@ -1,7 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum::EnumProperty;
-use strum_macros::{EnumIter, EnumProperty};
+use strum::{EnumIter, EnumProperty};
 
 /// Type of [Integrity](crate::podcast::Integrity).
 #[derive(Debug, PartialEq, Eq, EnumProperty, EnumIter)]

src/podcast/block.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Podcast platforms.
 ///

src/podcast/license.rs

@@ -1,7 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum::EnumProperty;
-use strum_macros::{EnumIter, EnumProperty};
+use strum::{EnumIter, EnumProperty};
 
 /// Type of [License](crate::podcast::License).
 #[derive(Debug, PartialEq, Eq, EnumProperty, EnumIter)]

src/podcast/live_item.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Status of [LiveItem](crate::podcast::LiveItem).
 #[derive(Debug, PartialEq, Eq, EnumIter)]

src/podcast/location.rs

@@ -1,6 +1,6 @@
 use crate::basic::{Float, NumberConstraint};
 use crate::Other;
-use strum_macros::{Display, EnumString};
+use strum::{Display, EnumString};
 
 /// Geographical coordinates.
 #[derive(Debug, PartialEq, Clone)]

src/podcast/medium.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Medium of the feed.
 #[derive(Debug, PartialEq, Eq, EnumIter)]

src/podcast/person.rs

@@ -1,7 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum::EnumProperty;
-use strum_macros::{EnumIter, EnumProperty};
+use strum::{EnumIter, EnumProperty};
 
 /// Group (as defined by [Podcast Taxonomy Project](https://podcasttaxonomy.com)) of [Person](crate::podcast::Person).
 #[derive(Debug, PartialEq, Eq, EnumProperty, EnumIter)]

src/podcast/social_interact.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Social protocols that can be used in [SocialInteract](crate::podcast::SocialInteract).
 #[derive(Debug, PartialEq, Eq, EnumIter)]

src/podcast/transcript.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Used for deserializing `rel` attribute of [Transcript](crate::podcast::Transcript).
 #[derive(Debug, PartialEq, Eq, EnumIter)]

src/podcast/txt.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Allowed purposes for [Txt](crate::podcast::Txt).
 #[derive(Debug, PartialEq, Eq, EnumIter)]

src/podcast/value.rs

@@ -1,6 +1,6 @@
 use crate::utils;
 use crate::Other;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 /// Type of [Value](crate::podcast::Value).
 #[derive(Debug, PartialEq, Eq, EnumIter)]