Use unicode-properties

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>

Author: LecrisUT

Cargo.toml

@@ -10,3 +10,4 @@ readme = "README.md"
 [dependencies]
 unicode-bidi = "0.3"
 unicode-normalization = "0.1"
+unicode-properties = "0.1.1"

src/lib.rs

@@ -4,10 +4,12 @@
 #![warn(missing_docs)]
 extern crate unicode_bidi;
 extern crate unicode_normalization;
+extern crate unicode_properties;
 
 use std::borrow::Cow;
 use std::fmt;
 use unicode_normalization::UnicodeNormalization;
+use unicode_properties::{GeneralCategoryGroup, UnicodeGeneralCategory};
 
 mod rfc3454;
 pub mod tables;
@@ -351,7 +353,7 @@ pub fn x520prep(s: &str, case_fold: bool) -> Result<Cow<'_, str>, Error> {
     // "The first code point of a string is prohibited from being a combining character."
     match s.chars().next() {
         Some(c) => {
-            if c.is_mark() {
+            if c.general_category_group() == GeneralCategoryGroup::Mark {
                 return Err(Error(ErrorCause::StartsWithCombiningCharacter));
             }
         }

src/tables.rs

@@ -2,6 +2,7 @@
 use std::cmp::Ordering;
 use std::str::Chars;
 use unicode_bidi::{bidi_class, BidiClass};
+use unicode_properties::{GeneralCategoryGroup, UnicodeGeneralCategory};
 
 use super::rfc3454;
 
@@ -245,6 +246,6 @@ pub fn x520_mapped_to_nothing(c: char) -> bool {
 pub fn x520_mapped_to_space(c: char) -> bool {
     match c {
         '\u{09}' | '\u{0A}'..='\u{0D}' | '\u{85}' => true,
-        _ => c.is_separator(),
+        _ => c.general_category_group() == GeneralCategoryGroup::Separator,
     }
 }