Upgrade to unicode-script 0.5.1

crlf0710 · crlf0710 · commit e8a8e162903e · 2020-06-12T13:00:49.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ according to Unicode Technical Standard #39 rules.
 exclude = [ "target/*", "Cargo.lock" ]
 
 [dependencies]
-unicode-script = { version = "0.4.0", default-features = false }
+unicode-script = { version = "0.5.1", default-features = false }
 unicode-normalization = { version = "0.1.12", default-features = false }
 std = { version = "1.0", package = "rustc-std-workspace-std", optional = true }
 core = { version = "1.0", package = "rustc-std-workspace-core", optional = true }
diff --git a/src/mixed_script.rs b/src/mixed_script.rs
@@ -23,10 +23,7 @@ impl From<ScriptExtension> for AugmentedScriptSet {
         let mut jpan = false;
         let mut kore = false;
 
-        if ext == ScriptExtension::Single(Script::Common)
-            || ext == ScriptExtension::Single(Script::Inherited)
-            || ext.contains_script(Script::Han)
-        {
+        if ext.is_common() || ext.is_inherited() || ext.contains_script(Script::Han) {
             hanb = true;
             jpan = true;
             kore = true;
@@ -67,7 +64,7 @@ impl From<&'_ str> for AugmentedScriptSet {
 impl Default for AugmentedScriptSet {
     fn default() -> Self {
         AugmentedScriptSet {
-            base: ScriptExtension::Single(Script::Common),
+            base: Script::Common.into(),
             hanb: true,
             jpan: true,
             kore: true,
@@ -91,8 +88,7 @@ impl AugmentedScriptSet {
 
     /// Check if the set is "All" (Common or Inherited)
     pub fn is_all(&self) -> bool {
-        self.base == ScriptExtension::Single(Script::Common)
-            || self.base == ScriptExtension::Single(Script::Inherited)
+        self.base.is_common() || self.base.is_inherited()
     }
 
     /// Construct an AugmentedScriptSet for a given character
diff --git a/src/restriction_level.rs b/src/restriction_level.rs
@@ -3,7 +3,7 @@
 
 use crate::mixed_script::AugmentedScriptSet;
 use crate::GeneralSecurityProfile;
-use unicode_script::{Script, ScriptExtension};
+use unicode_script::Script;
 
 #[derive(Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
 /// The [Restriction level](https://www.unicode.org/reports/tr39/#Restriction_Level_Detection)
@@ -64,7 +64,8 @@ impl RestrictionLevelDetection for &'_ str {
             return RestrictionLevel::SingleScript;
         } else if exclude_latin_set.kore || exclude_latin_set.hanb || exclude_latin_set.jpan {
             return RestrictionLevel::HighlyRestrictive;
-        } else if let ScriptExtension::Single(script) = exclude_latin_set.base {
+        } else if exclude_latin_set.base.len() == 1 {
+            let script = exclude_latin_set.base.iter().next().unwrap();
             if script.is_recommended() && script != Script::Cyrillic && script != Script::Greek {
                 return RestrictionLevel::ModeratelyRestrictive;
             }
