Specify individual unic dependencies

coolreader18 · coolreader18 · commit 8c13eeaf217b · 2020-04-14T13:03:54.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -17,4 +17,4 @@ log="0.4.1"
 num-bigint = "0.2"
 num-traits = "0.2"
 unic-emoji-char = "0.9"
-unic-ucd-ident = "0.9"
+unic-ucd-ident  = "0.9"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -53,12 +53,6 @@ hex = "0.4.0"
 hexf-parse = "0.1.0"
 indexmap = "1.0.2"
 crc = "^1.0.0"
-unicode_names2 = "0.3"
-# TODO: use unic for this; needed for title case:
-# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
-unicode-casing = "0.1"
-unic = "0.9"
-unic-common = "0.9"
 maplit = "1.0"
 bitflags = "1.2.1"
 libc = "0.2"
@@ -75,6 +69,19 @@ smallbox = "0.8"
 bstr = "0.2.12"
 crossbeam-utils = "0.7"
 
+## unicode stuff
+unicode_names2 = "0.4"
+# TODO: use unic for this; needed for title case:
+# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
+unicode-casing = "0.1"
+# update version all at the same time
+unic-bidi          = "0.9"
+unic-char-property = "0.9"
+unic-normal        = "0.9"
+unic-ucd-category  = "0.9"
+unic-ucd-age       = "0.9"
+unic-ucd-ident     = "0.9"
+
 flame = { version = "0.2", optional = true }
 flamer = { version = "0.3", optional = true }
 
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -7,8 +7,8 @@ use std::string::ToString;
 
 use crossbeam_utils::atomic::AtomicCell;
 use num_traits::ToPrimitive;
-use unic::ucd::category::GeneralCategory;
-use unic::ucd::ident::{is_xid_continue, is_xid_start};
+use unic_ucd_category::GeneralCategory;
+use unic_ucd_ident::{is_xid_continue, is_xid_start};
 use unicode_casing::CharExt;
 
 use super::objbytes::{PyBytes, PyBytesRef};
diff --git a/vm/src/stdlib/unicodedata.rs b/vm/src/stdlib/unicodedata.rs
@@ -9,12 +9,11 @@ use crate::pyobject::{PyClassImpl, PyObject, PyObjectRef, PyResult, PyValue};
 use crate::vm::VirtualMachine;
 
 use itertools::Itertools;
-use unic::bidi::BidiClass;
-use unic::char::property::EnumeratedCharProperty;
-use unic::normal::StrNormalForm;
-use unic::ucd::category::GeneralCategory;
-use unic::ucd::{Age, Name};
-use unic_common::version::UnicodeVersion;
+use unic_bidi::BidiClass;
+use unic_char_property::EnumeratedCharProperty;
+use unic_normal::StrNormalForm;
+use unic_ucd_age::{Age, UnicodeVersion, UNICODE_VERSION};
+use unic_ucd_category::GeneralCategory;
 
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     let ctx = &vm.ctx;
@@ -71,7 +70,7 @@ impl Default for PyUCD {
     #[inline(always)]
     fn default() -> Self {
         PyUCD {
-            unic_version: unic::UNICODE_VERSION,
+            unic_version: UNICODE_VERSION,
         }
     }
 }
@@ -105,7 +104,6 @@ impl PyUCD {
 
     #[pymethod]
     fn lookup(&self, name: PyStringRef, vm: &VirtualMachine) -> PyResult<String> {
-        // TODO: we might want to use unic_ucd instead of unicode_names2 for this too, if possible:
         if let Some(character) = unicode_names2::character(name.as_str()) {
             if self.check_age(character) {
                 return Ok(character.to_string());
@@ -125,7 +123,7 @@ impl PyUCD {
 
         if let Some(c) = c {
             if self.check_age(c) {
-                if let Some(name) = Name::of(c) {
+                if let Some(name) = unicode_names2::name(c) {
                     return Ok(vm.new_str(name.to_string()));
                 }
             }
