@@ -23,9 +23,10 @@ impl From<ScriptExtension> for AugmentedScriptSet {
2323 let mut jpan = false ;
2424 let mut kore = false ;
2525
26- if ext == ScriptExtension :: Single ( Script :: Common ) ||
27- ext == ScriptExtension :: Single ( Script :: Inherited ) ||
28- ext. contains_script ( Script :: Han ) {
26+ if ext == ScriptExtension :: Single ( Script :: Common )
27+ || ext == ScriptExtension :: Single ( Script :: Inherited )
28+ || ext. contains_script ( Script :: Han )
29+ {
2930 hanb = true ;
3031 jpan = true ;
3132 kore = true ;
@@ -44,7 +45,9 @@ impl From<ScriptExtension> for AugmentedScriptSet {
4445 }
4546 Self {
4647 base : ext,
47- hanb, jpan, kore
48+ hanb,
49+ jpan,
50+ kore,
4851 }
4952 }
5053}
@@ -74,7 +77,7 @@ impl Default for AugmentedScriptSet {
7477
7578impl AugmentedScriptSet {
7679 /// Intersect this set with another
77- pub fn intersect_with ( & mut self , other : Self ) {
80+ pub fn intersect_with ( & mut self , other : Self ) {
7881 self . base . intersect_with ( other. base ) ;
7982 self . hanb = self . hanb && other. hanb ;
8083 self . jpan = self . jpan && other. jpan ;
@@ -83,13 +86,13 @@ impl AugmentedScriptSet {
8386
8487 /// Check if the set is empty
8588 pub fn is_empty ( & self ) -> bool {
86- self . base . is_empty ( ) && ! self . hanb && !self . jpan && !self . kore
89+ self . base . is_empty ( ) && !self . hanb && !self . jpan && !self . kore
8790 }
8891
8992 /// Check if the set is "All" (Common or Inherited)
9093 pub fn is_all ( & self ) -> bool {
91- self . base == ScriptExtension :: Single ( Script :: Common ) ||
92- self . base == ScriptExtension :: Single ( Script :: Inherited )
94+ self . base == ScriptExtension :: Single ( Script :: Common )
95+ || self . base == ScriptExtension :: Single ( Script :: Inherited )
9396 }
9497
9598 /// Construct an AugmentedScriptSet for a given character
0 commit comments