Merge #258

258: Release v0.9.0 r=behnam a=behnam ### Add - `unic-ucd-name_aliases`: Unicode Name Alias character properties. ### Changed - `unic-cli`: Fallback to Name Alias for characters without Name value. ### Fixed - `ucd-ident`: Use correct data table for `PatternWhitespace` property. [[GH-254](#254)] ### Misc - Use external git submodules for source data. - Migrate to Rust 2018 Edition.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/open-i18n/rust-unic/258)  Co-authored-by: Behnam Esfahbod <[email protected]>
open-i18n · Mar 3, 2019 · 89f5f55 · 89f5f55
2 parents 2fa4706 + 8a6ce83
commit 89f5f55
Show file tree

Hide file tree

Showing 38 changed files with 170 additions and 155 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 
 ## [Unreleased]
-[Unreleased]: https://github.com/open-i18n/rust-unic/compare/v0.8.0...HEAD
+[Unreleased]: https://github.com/open-i18n/rust-unic/compare/v0.9.0...HEAD
+
+
+## [v0.9.0] - 2019-03-02
+[v0.9.0]: https://github.com/open-i18n/rust-unic/compare/v0.8.0...v0.9.0
 
 ### Add
 

diff --git a/README.md b/README.md
@@ -167,7 +167,7 @@ In `Cargo.toml`:
 
 ```toml
 [dependencies]
-unic = "0.8.0"  # This has Unicode 10.0.0 data and algorithms
+unic = "0.9.0"  # This has Unicode 10.0.0 data and algorithms
 ```
 
 And in `main.rs`:

diff --git a/apps/cli/Cargo.toml b/apps/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-cli"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -11,7 +11,7 @@ categories = ["internationalization", "text-processing", "parsing", "command-lin
 readme = "README.md"
 
 [dependencies]
-unic = { path = "../../unic/", version = "0.8.0" }
+unic = { path = "../../unic/", version = "0.9.0" }
 
 clap = "2.29"
 lazy_static = "1.0"

diff --git a/etc/common.sh b/etc/common.sh
@@ -17,9 +17,9 @@ set -e
 export COMPONENTS="
     unic/common
 
-    unic/char/basics
     unic/char/range
 
+    unic/char/basics
     unic/char/property
 
     unic/char
@@ -36,6 +36,7 @@ export COMPONENTS="
     unic/ucd/common
     unic/ucd/ident
     unic/ucd/name
+    unic/ucd/name_aliases
     unic/ucd/normal
     unic/ucd/segment
 

diff --git a/gen/Cargo.toml b/gen/Cargo.toml
@@ -9,7 +9,7 @@ description = "UNIC — Table Generation"
 publish = false
 
 [dependencies]
-unic-char-range = { path = "../unic/char/range/", version = "0.8.0" }
+unic-char-range = { path = "../unic/char/range/", version = "0.9.0" }
 
 # Command line argument parsing
 clap = "2.29"

diff --git a/gen/src/source/ucd/name_aliases.rs b/gen/src/source/ucd/name_aliases.rs
@@ -18,16 +18,19 @@ use regex::Regex;
 use crate::source::utils::read;
 
 // String constants representing name alias types
-// Note: The string corresponds to unic_name_aliases::NameAliasType enum cases
+// Note: The string corresponds to unic_ucd_name_aliases::NameAliasType enum cases
 static TYPE_STR_CORRECTIONS: &str = "NameCorrections";
 static TYPE_STR_CONTROLS: &str = "ControlCodeNames";
 static TYPE_STR_ALTERNATES: &str = "AlternateNames";
 static TYPE_STR_FIGMENTS: &str = "Figments";
 static TYPE_STR_ABBREVIATIONS: &str = "NameAbbreviations";
 
 lazy_static! {
-    pub static ref NAME_ALIASES_DATA: NameAliasesData =
-        { read("external/unicode/ucd/data/NameAliases.txt").parse().unwrap() };
+    pub static ref NAME_ALIASES_DATA: NameAliasesData = {
+        read("external/unicode/ucd/data/NameAliases.txt")
+            .parse()
+            .unwrap()
+    };
 }
 
 #[derive(Clone, Default, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
@@ -54,7 +57,8 @@ impl FromStr for NameAliasesData {
                   ;([[:alnum:]\ \-]*) # alias
                   ;([[:alpha:]]*)     # type
                 ",
-            ).unwrap();
+            )
+            .unwrap();
         }
 
         let mut name_alias_types: BTreeMap<char, Vec<String>> = BTreeMap::default();
@@ -73,9 +77,9 @@ impl FromStr for NameAliasesData {
                     if $map.contains_key(&chr) {
                         if let Some(values) = $map.get_mut(&chr) {
                             // Check for duplications because this macro is also used
-                            // for inserting types strings to name_alias_types. 
-                            // In case of a character having multiple values for the 
-                            // same type, if we don't check for duplications, the type 
+                            // for inserting types strings to name_alias_types.
+                            // In case of a character having multiple values for the
+                            // same type, if we don't check for duplications, the type
                             // string would be inserted more than once.
                             if !values.contains(&$value) {
                                 values.push($value);
@@ -84,7 +88,7 @@ impl FromStr for NameAliasesData {
                     } else {
                         $map.insert(chr, vec![$value]);
                     }
-                }
+                };
             }
 
             let alias = capture[2].to_owned();
@@ -119,7 +123,7 @@ impl FromStr for NameAliasesData {
             controls,
             alternates,
             figments,
-            abbreviations
+            abbreviations,
         })
     }
 }
diff --git a/gen/src/writer/ucd/name_aliases.rs b/gen/src/writer/ucd/name_aliases.rs
@@ -27,17 +27,19 @@ fn emit_unified_name_aliases_table(dir: &Path) {
     write(
         dir,
         "name_alias_types.rsv",
-        &NAME_ALIASES_DATA.name_alias_types.to_direct_char_table(|alias_types, f| {
-            write!(
-                f,
-                "&[{}]",
-                alias_types
-                    .iter()
-                    .map(|alias_type_str| format!("{}", alias_type_str.to_owned()))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }),
+        &NAME_ALIASES_DATA
+            .name_alias_types
+            .to_direct_char_table(|alias_types, f| {
+                write!(
+                    f,
+                    "&[{}]",
+                    alias_types
+                        .iter()
+                        .map(|alias_type_str| format!("{}", alias_type_str.to_owned()))
+                        .collect::<Vec<_>>()
+                        .join(", ")
+                )
+            }),
     );
 }
 
@@ -59,7 +61,7 @@ fn emit_name_aliases_table(dir: &Path) {
                     )
                 }),
             );
-        }
+        };
     }
 
     write_map_to_file!(corrections, "corrections.rsv");

diff --git a/unic/Cargo.toml b/unic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -20,17 +20,17 @@ bench_it = ["unic-bidi/bench_it"]
 serde = ["unic-bidi/serde"]
 
 [dependencies]
-unic-bidi = { path = "bidi/", version = "0.8.0" }
-unic-char = { path = "char/", version = "0.8.0", features = ["std"] }
-unic-common = { path = "common/", version = "0.8.0" }
-unic-emoji = { path = "emoji/", version = "0.8.0" }
-unic-idna = { path = "idna/", version = "0.8.0" }
-unic-normal = { path = "normal/", version = "0.8.0" }
-unic-segment = { path = "segment/", version = "0.8.0" }
-unic-ucd = { path = "ucd/", version = "0.8.0" }
+unic-bidi = { path = "bidi/", version = "0.9.0" }
+unic-char = { path = "char/", version = "0.9.0", features = ["std"] }
+unic-common = { path = "common/", version = "0.9.0" }
+unic-emoji = { path = "emoji/", version = "0.9.0" }
+unic-idna = { path = "idna/", version = "0.9.0" }
+unic-normal = { path = "normal/", version = "0.9.0" }
+unic-segment = { path = "segment/", version = "0.9.0" }
+unic-ucd = { path = "ucd/", version = "0.9.0" }
 
 [dev-dependencies]
-unic-char-range = { path = "char/range/", version = "0.8.0" }
+unic-char-range = { path = "char/range/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/bidi/Cargo.toml b/unic/bidi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-bidi"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -23,12 +23,12 @@ bench_it = []
 [dependencies]
 matches = "0.1"
 serde = { version = ">=0.8, <2.0", optional = true, features = ["derive"] }
-unic-ucd-bidi = { path = "../ucd/bidi/", version = "0.8.0" }
+unic-ucd-bidi = { path = "../ucd/bidi/", version = "0.9.0" }
 
 [dev-dependencies]
 serde_test = ">=0.8, <2.0"
-unic-char-property = { path = "../char/property/", version = "0.8.0" }
-unic-ucd-version = { path = "../ucd/version/", version = "0.8.0" }
+unic-char-property = { path = "../char/property/", version = "0.9.0" }
+unic-ucd-version = { path = "../ucd/version/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/char/Cargo.toml b/unic/char/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-char"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -18,9 +18,9 @@ default = []
 std = ["unic-char-range/std"]
 
 [dependencies]
-unic-char-basics = { path = "basics/", version = "0.8.0" }
-unic-char-property = { path = "property/", version = "0.8.0" }
-unic-char-range = { path = "range/", version = "0.8.0" }
+unic-char-basics = { path = "basics/", version = "0.9.0" }
+unic-char-property = { path = "property/", version = "0.9.0" }
+unic-char-range = { path = "range/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/char/basics/Cargo.toml b/unic/char/basics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-char-basics"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -14,7 +14,7 @@ readme = "README.md"
 exclude = []
 
 [dev-dependencies]
-unic-char-range = { path = "../range/", version = "0.8.0" }
+unic-char-range = { path = "../range/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/char/property/Cargo.toml b/unic/char/property/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-char-property"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -13,7 +13,7 @@ categories = ["internationalization", "text-processing", "parsing"]
 exclude = []
 
 [dependencies]
-unic-char-range = { path = "../range/", version = "0.8.0" }
+unic-char-range = { path = "../range/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/char/range/Cargo.toml b/unic/char/range/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-char-range"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"

diff --git a/unic/common/Cargo.toml b/unic/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-common"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"

diff --git a/unic/emoji/Cargo.toml b/unic/emoji/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-emoji"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -13,7 +13,7 @@ categories = ["internationalization", "text-processing", "parsing", "rendering"]
 exclude = []
 
 [dependencies]
-unic-emoji-char = { path = "char/", version = "0.8.0" }
+unic-emoji-char = { path = "char/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/emoji/char/Cargo.toml b/unic/emoji/char/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-emoji-char"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -13,9 +13,9 @@ categories = ["internationalization", "text-processing", "parsing", "rendering"]
 exclude = []
 
 [dependencies]
-unic-char-property = { path = "../../char/property/", version = "0.8.0" }
-unic-char-range = { path = "../../char/range", version = "0.8.0" }
-unic-ucd-version = { path = "../../ucd/version/", version = "0.8.0" }
+unic-char-property = { path = "../../char/property/", version = "0.9.0" }
+unic-char-range = { path = "../../char/range", version = "0.9.0" }
+unic-ucd-version = { path = "../../ucd/version/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/idna/Cargo.toml b/unic/idna/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-idna"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -15,12 +15,12 @@ exclude = ["tests/conformance_tests.rs"]
 
 [dependencies]
 matches = "0.1"
-unic-idna-punycode = { path = "punycode/", version = "0.8.0" }
-unic-idna-mapping = { path = "mapping/", version = "0.8.0" }
-unic-normal = { path = "../normal/", version = "0.8.0" }
-unic-ucd-bidi = { path = "../ucd/bidi/", version = "0.8.0" }
-unic-ucd-normal = { path = "../ucd/normal/", version = "0.8.0" }
-unic-ucd-version = { path = "../ucd/version/", version = "0.8.0" }
+unic-idna-punycode = { path = "punycode/", version = "0.9.0" }
+unic-idna-mapping = { path = "mapping/", version = "0.9.0" }
+unic-normal = { path = "../normal/", version = "0.9.0" }
+unic-ucd-bidi = { path = "../ucd/bidi/", version = "0.9.0" }
+unic-ucd-normal = { path = "../ucd/normal/", version = "0.9.0" }
+unic-ucd-version = { path = "../ucd/version/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/idna/mapping/Cargo.toml b/unic/idna/mapping/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-idna-mapping"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"
@@ -13,9 +13,9 @@ categories = ["internationalization", "text-processing", "parsing", "rendering"]
 exclude = []
 
 [dependencies]
-unic-char-range = { path = "../../char/range/", version = "0.8.0" }
-unic-char-property = { path = "../../char/property/", version = "0.8.0" }
-unic-ucd-version = { path = "../../ucd/version/", version = "0.8.0" }
+unic-char-range = { path = "../../char/range/", version = "0.9.0" }
+unic-char-property = { path = "../../char/property/", version = "0.9.0" }
+unic-ucd-version = { path = "../../ucd/version/", version = "0.9.0" }
 
 [badges]
 maintenance = { status = "actively-developed" }

diff --git a/unic/idna/punycode/Cargo.toml b/unic/idna/punycode/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "unic-idna-punycode"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 authors = ["The UNIC Project Developers"]
 repository = "https://github.com/open-i18n/rust-unic/"