update

Signed-off-by: Joe McCain III <jo3mccain@icloud.com>

Author: FL03

core/src/intervals/interval.rs

@@ -6,22 +6,32 @@ use super::IntervalLevel;
 
 pub struct Interval<Q> {
     pub level: IntervalLevel,
-    pub quality: Option<Q>,
+    pub quality: Q,
     pub value: i8,
 }
 
+impl<Q> Interval<Q> {
+    pub fn new(level: IntervalLevel, quality: Q, value: i8) -> Self {
+        Self {
+            level,
+            quality,
+            value,
+        }
+    }
+}
+
+pub struct IntervalQuality<T> {
+    pub level: IntervalLevel,
+    pub name: &'static str,
+    pub value: Option<T>,
+}
+
 pub trait Quality<T> {
-    type Group;
+    type Level;
 
-    fn group(&self) -> Self::Group;
+    fn level(&self) -> Self::Level;
 
     fn name(&self) -> &str;
 
     fn value(&self) -> T;
 }
-
-pub struct Variant<K, V> {
-    pub group: K,
-    pub name: &'static str,
-    pub value: V,
-}

core/src/intervals/kinds.rs

@@ -72,7 +72,7 @@ impl Intervals {
             9 => Sevenths(Seventh::Diminished),
             10 => Sevenths(Seventh::Minor),
             11 => Sevenths(Seventh::Major),
-            _ => panic!("Invalid interval value: {}", pitch),
+            _ => unreachable!("The pitch value is out of range."),
         }
     }
     /// A convenience method for constructing a new instance of the [Octave](Intervals::Octave) variant.
@@ -91,7 +91,6 @@ impl Intervals {
     pub fn third(third: Third) -> Self {
         Intervals::Thirds(third)
     }
-
     /// A convenience method for constructing a new variant, [`Fourths`](Intervals::Fourths).
     pub fn fourth(fourth: Fourth) -> Self {
         Intervals::Fourths(fourth)
@@ -124,28 +123,24 @@ impl Intervals {
             Intervals::Octave => 12,
         }
     }
-}
 
-macro_rules! impl_new_interval {
-    (@impl $name:ident::$variant:ident.$call:ident($($T:ident)::*)) => {
-        pub fn $call() -> Self {
-            $name::$variant($($T)::*)
-        }
-    };
-
-    (@impl $name:ident::$variant:ident.$call:ident) => {
-        pub fn $call() -> Self {
-            $name::$variant
-        }
-    };
+    variant_constructors! {
+        Intervals {
+            Thirds.major_third::<Third::Major>(),
+            Thirds.minor_third::<Third::Minor>(),
+            Fourths.perfect_fourth::<Fourth::Perfect>(),
+            Fifths.diminished_fifth::<Fifth::Diminished>(),
+            Fifths.perfect_fifth::<Fifth::Perfect>(),
+            Fifths.augmented_fifth::<Fifth::Augmented>(),
+            Sevenths.diminished_seventh::<Seventh::Diminished>(),
+            Sevenths.minor_seventh::<Seventh::Minor>(),
+            Sevenths.major_seventh::<Seventh::Major>(),
 
-    ($name:ident {$($variant:ident.$call:ident$(($($T:ident)::*))?),* $(,)?}) => {
-        impl $name {
-            $(impl_new_interval!(@impl $name::$variant.$call$(($($T)::*))?);)*
         }
-    };
+    }
 }
 
+
 macro_rules! impl_from_value {
     (@impl $name:ident::$variant:ident($T:ty)) => {
         impl From<$T> for $name {
@@ -161,20 +156,7 @@ macro_rules! impl_from_value {
     };
 }
 
-impl_new_interval! {
-    Intervals {
-        Thirds.minor_third(Third::Minor),
-        Thirds.major_third(Third::Major),
-        Fourths.perfect_fourth(Fourth::Perfect),
-        Fifths.diminished_fifth(Fifth::Diminished),
-        Fifths.perfect_fifth(Fifth::Perfect),
-        Fifths.augmented_fifth(Fifth::Augmented),
-        Sevenths.diminished_seventh(Seventh::Diminished),
-        Sevenths.minor_seventh(Seventh::Minor),
-        Sevenths.major_seventh(Seventh::Major),
-        Sevenths.augmented_seventh(Seventh::Augmented),
-    }
-}
+
 
 impl<P> From<P> for Intervals
 where

core/src/intervals/mod.rs

@@ -5,6 +5,7 @@
 #[doc(inline)]
 pub use self::{kinds::*, types::*};
 
+#[macro_use]
 pub(crate) mod kinds;
 pub(crate) mod types;
 

core/src/macros/enums.rs

@@ -3,6 +3,26 @@
     Contrib: FL03 <jo3mccain@icloud.com>
 */
 
+macro_rules! variant_constructors {
+    (@impl $name:ident::$variant:ident.$call:ident::<$($T:ident)::*>()) => {
+        pub fn $call() -> Self {
+            $name::$variant($($T)::*)
+        }
+    };
+
+    (@impl $name:ident::$variant:ident.$call:ident()) => {
+        pub fn $call() -> Self {
+            $name::$variant
+        }
+    };
+
+    ($name:ident {$($variant:ident.$call:ident$(::<$($T:ident)::*>)?()),* $(,)?}) => {
+        $(
+            variant_constructors!(@impl $name::$variant.$call$(::<$($T)::*>)?());
+        )*
+    };
+}
+
 macro_rules! unit_enum {
     ($(#[derive($($der:ident),*$(,)?)])? $vis:vis enum $class:ident $($rest:tt)*) => {
         unit_enum!(

neo/src/lib.rs

@@ -21,7 +21,7 @@ pub use self::{
         kinds::{Augmented, Diminished, Major, Minor},
         Triad,
     },
-    types::*,
+    types::prelude::*,
 };
 
 #[macro_use]