Merge pull request unicode-rs#6 from unicode-rs/fmt

Manishearth · web-flow · commit 1d75a9d7d74f · 2020-06-23T14:36:27.000-07:00
Add Display impls
diff --git a/src/lib.rs b/src/lib.rs
@@ -112,6 +112,12 @@ impl From<char> for Script {
     }
 }
 
+impl fmt::Display for Script {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.full_name())
+    }
+}
+
 #[derive(Clone, Copy, PartialEq, Eq, Hash)]
 #[non_exhaustive]
 /// A value for the `Script_Extension` property
@@ -295,6 +301,13 @@ 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() {
@@ -311,7 +324,7 @@ impl fmt::Debug for ScriptExtension {
                 script.full_name().fmt(f)?;
             }
         }
-        write!(f, ")")
+        Ok(())
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,12 @@ impl From<char> for Script {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
	`115`	`+impl fmt::Display for Script {`
	`116`	`+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
	`117`	`+ write!(f, "{}", self.full_name())`
	`118`	`+ }`
	`119`	`+}`
	`120`	`+`
`115`	`121`	`#[derive(Clone, Copy, PartialEq, Eq, Hash)]`
`116`	`122`	`#[non_exhaustive]`
`117`	`123`	/// A value for the `Script_Extension` property
`@@ -295,6 +301,13 @@ impl From<&'_ str> for ScriptExtension {`
`295`	`301`	`impl fmt::Debug for ScriptExtension {`
`296`	`302`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`297`	`303`	`write!(f, "ScriptExtension(")?;`
	`304`	`+ fmt::Display::fmt(self, f)?;`
	`305`	`+ write!(f, ")")`
	`306`	`+ }`
	`307`	`+}`
	`308`	`+`
	`309`	`+impl fmt::Display for ScriptExtension {`
	`310`	`+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`298`	`311`	`if self.is_common() {`
`299`	`312`	`write!(f, "Common")?;`
`300`	`313`	`} else if self.is_inherited() {`
`@@ -311,7 +324,7 @@ impl fmt::Debug for ScriptExtension {`
`311`	`324`	`script.full_name().fmt(f)?;`
`312`	`325`	`}`
`313`	`326`	`}`
`314`		`- write!(f, ")")`
	`327`	`+ Ok(())`
`315`	`328`	`}`
`316`	`329`	`}`
`317`	`330`