Fixes for debug formatting

* Debug now prints full values for the internal representation, which is
  more helpful when combined with a hex or binary printing mode.
* Display now properly renders all the scripts with " + " seperators.

Author: dcsommer

src/lib.rs

@@ -131,7 +131,7 @@ impl fmt::Display for Script {
     }
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 #[non_exhaustive]
 /// A value for the `Script_Extension` property
 ///
@@ -311,33 +311,23 @@ impl From<&'_ str> for ScriptExtension {
     }
 }
 
-impl fmt::Debug for ScriptExtension {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ScriptExtension(")?;
-        fmt::Display::fmt(self, f)?;
-        write!(f, ")")
-    }
-}
-
 impl fmt::Display for ScriptExtension {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if self.is_common() {
-            write!(f, "Common")?;
-        } else if self.is_inherited() {
-            write!(f, "Inherited")?;
-        } else if self.is_empty() {
+        write!(f, "ScriptExtension(")?;
+        if self.is_empty() {
             write!(f, "Unknown")?;
         } else {
             let mut first = true;
             for script in self.iter() {
-                if !first {
-                    write!(f, " + ")?;
+                if first {
                     first = false;
+                } else {
+                    write!(f, " + ")?;
                 }
                 script.full_name().fmt(f)?;
             }
         }
-        Ok(())
+        write!(f, ")")
     }
 }
 
@@ -361,7 +351,7 @@ impl UnicodeScript for char {
 
 /// Iterator over scripts in a [ScriptExtension].
 ///
-/// Can be obtained ia [ScriptExtension::iter()]
+/// Can be obtained via [ScriptExtension::iter()]
 pub struct ScriptIterator {
     ext: ScriptExtension,
 }
@@ -445,11 +435,11 @@ mod tests {
         let ext = ScriptExtension::for_str(s);
         assert_eq!(ext, script_extensions::DEVA);
         println!(
-            "{:?}",
+            "{}",
             script_extensions::DEVA_DOGR_GUJR_GURU_KHOJ_KTHI_MAHJ_MODI_SIND_TAKR_TIRH
         );
         println!(
-            "{:?}",
+            "{}",
             ext.intersection(
                 script_extensions::DEVA_DOGR_GUJR_GURU_KHOJ_KTHI_MAHJ_MODI_SIND_TAKR_TIRH
             )