diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:21:20 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:21:20 +0000 |
commit | 22dc65a575055adf5b137253c77fca20376d85f2 (patch) | |
tree | 105ba11fd4b0f188e43f4106db8f315a4c63866c | |
parent | 8d034406e06685ce777ea747c641b813f47900f8 (diff) | |
parent | 166b9fb9b503067dfd08cdf95b98dd1987db3bf0 (diff) | |
download | unicode-xid-android14-mainline-networking-release.tar.gz |
Snap for 10447354 from 166b9fb9b503067dfd08cdf95b98dd1987db3bf0 to mainline-networking-releaseaml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000android14-mainline-networking-release
Change-Id: I0a85c5f71aa7ee13fef79e3465d0d7a00a774851
-rw-r--r-- | Android.bp | 12 | ||||
-rw-r--r-- | Cargo.toml | 38 | ||||
-rw-r--r-- | Cargo.toml.orig | 8 | ||||
-rw-r--r-- | METADATA | 11 | ||||
-rw-r--r-- | README.md | 11 | ||||
-rw-r--r-- | TEST_MAPPING | 215 | ||||
-rw-r--r-- | patches/std.diff | 27 | ||||
-rw-r--r-- | src/lib.rs | 1 | ||||
-rw-r--r-- | src/tables.rs | 183 |
9 files changed, 213 insertions, 293 deletions
@@ -43,10 +43,16 @@ rust_library { host_supported: true, crate_name: "unicode_xid", cargo_env_compat: true, - cargo_pkg_version: "0.2.2", + cargo_pkg_version: "0.2.4", srcs: ["src/lib.rs"], edition: "2015", features: ["default"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, } rust_test { @@ -54,7 +60,7 @@ rust_test { host_supported: true, crate_name: "unicode_xid", cargo_env_compat: true, - cargo_pkg_version: "0.2.2", + cargo_pkg_version: "0.2.4", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -73,7 +79,7 @@ rust_test { host_supported: true, crate_name: "exhaustive_tests", cargo_env_compat: true, - cargo_pkg_version: "0.2.2", + cargo_pkg_version: "0.2.4", srcs: ["tests/exhaustive_tests.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -3,29 +3,45 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies +# to registry (e.g., crates.io) dependencies. # -# If you believe there's an error in this file please file an -# issue against the rust-lang/cargo repository. If you're -# editing this file be aware that the upstream Cargo.toml -# will likely look very different (and much more reasonable) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] +rust-version = "1.17" name = "unicode-xid" -version = "0.2.2" -authors = ["erick.tryzelaar <erick.tryzelaar@gmail.com>", "kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"] -exclude = ["/scripts/*", "/.travis.yml"] -description = "Determine whether characters have the XID_Start\nor XID_Continue properties according to\nUnicode Standard Annex #31.\n" +version = "0.2.4" +authors = [ + "erick.tryzelaar <erick.tryzelaar@gmail.com>", + "kwantam <kwantam@gmail.com>", + "Manish Goregaokar <manishsmail@gmail.com>", +] +exclude = [ + "/.github/**", + "/scripts/*", +] +description = """ +Determine whether characters have the XID_Start +or XID_Continue properties according to +Unicode Standard Annex #31. +""" homepage = "https://github.com/unicode-rs/unicode-xid" documentation = "https://unicode-rs.github.io/unicode-xid" readme = "README.md" -keywords = ["text", "unicode", "xid"] +keywords = [ + "text", + "unicode", + "xid", +] license = "MIT OR Apache-2.0" repository = "https://github.com/unicode-rs/unicode-xid" [[bench]] name = "xid" harness = false + [dev-dependencies.criterion] version = "0.3" @@ -33,5 +49,3 @@ version = "0.3" bench = [] default = [] no_std = [] -[badges.travis-ci] -repository = "unicode-rs/unicode-xid" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 25a7b15..fed55cd 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,7 +1,7 @@ [package] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" authors = ["erick.tryzelaar <erick.tryzelaar@gmail.com>", "kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>" @@ -18,10 +18,8 @@ Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31. """ -exclude = ["/scripts/*", "/.travis.yml"] - -[badges] -travis-ci = { repository = "unicode-rs/unicode-xid" } +exclude = ["/.github/**", "/scripts/*"] +rust-version = "1.17" [features] default = [] @@ -1,5 +1,5 @@ name: "unicode-xid" -description: "Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31." +description: "()" third_party { url { type: HOMEPAGE @@ -7,13 +7,14 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.2.crate" + value: "https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.4.crate" } - version: "0.2.2" + version: "0.2.4" + # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same. license_type: NOTICE last_upgrade_date { - year: 2021 - month: 5 + year: 2022 + month: 12 day: 19 } } @@ -3,7 +3,7 @@ Determine if a `char` is a valid identifier for a parser and/or lexer according to [Unicode Standard Annex #31](http://www.unicode.org/reports/tr31/) rules. -[![Build Status](https://travis-ci.org/unicode-rs/unicode-xid.svg)](https://travis-ci.org/unicode-rs/unicode-xid) +[![Build Status](https://img.shields.io/github/workflow/status/unicode-rs/unicode-xid/CI/master)](https://github.com/unicode-rs/unicode-xid/actions?query=branch%3Amaster) [Documentation](https://unicode-rs.github.io/unicode-xid/unicode_xid/index.html) @@ -26,6 +26,15 @@ on std, and instead uses equivalent functions from core. # changelog +## 0.2.4 + +- Update to Unicode 15.0.0 +- Replace `const` tables with `static` tables. + +## 0.2.3 + +- Update to Unicode 14.0.0 + ## 0.2.2 - Add an ASCII fast-path diff --git a/TEST_MAPPING b/TEST_MAPPING index c74c9b1..3a1c7de 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,239 +2,32 @@ { "imports": [ { - "path": "external/rust/crates/anyhow" + "path": "external/rust/crates/zeroize" }, { - "path": "external/rust/crates/arbitrary" + "path": "external/uwb/src" }, { - "path": "external/rust/crates/argh" + "path": "system/keymint/derive" }, { - "path": "external/rust/crates/base64" - }, - { - "path": "external/rust/crates/bitflags" - }, - { - "path": "external/rust/crates/bytes" - }, - { - "path": "external/rust/crates/either" - }, - { - "path": "external/rust/crates/futures-util" - }, - { - "path": "external/rust/crates/jni" - }, - { - "path": "external/rust/crates/libm" - }, - { - "path": "external/rust/crates/libsqlite3-sys" - }, - { - "path": "external/rust/crates/oid-registry" - }, - { - "path": "external/rust/crates/rand_chacha" - }, - { - "path": "external/rust/crates/serde" - }, - { - "path": "external/rust/crates/serde-xml-rs" - }, - { - "path": "external/rust/crates/serde_cbor" - }, - { - "path": "external/rust/crates/slab" - }, - { - "path": "external/rust/crates/tinytemplate" - }, - { - "path": "external/rust/crates/tinyvec" - }, - { - "path": "external/rust/crates/tokio" - }, - { - "path": "external/rust/crates/tokio-test" - }, - { - "path": "external/rust/crates/unicode-bidi" - }, - { - "path": "external/rust/crates/url" + "path": "system/keymint/hal" } ], "presubmit": [ { - "name": "ZipFuseTest" - }, - { - "name": "apkdmverity.test" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "diced_open_dice_cbor_test" - }, - { - "name": "diced_sample_inputs_test" - }, - { - "name": "diced_test" - }, - { - "name": "diced_utils_test" - }, - { - "name": "diced_vendor_test" - }, - { - "name": "doh_unit_test" - }, - { - "name": "keystore2_crypto_test_rust" - }, - { - "name": "keystore2_km_compat_test" - }, - { - "name": "keystore2_selinux_concurrency_test" - }, - { - "name": "keystore2_selinux_test" - }, - { - "name": "keystore2_test" - }, - { - "name": "keystore2_test_utils_test" - }, - { - "name": "keystore2_vintf_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "libcert_request_validator_tests" - }, - { - "name": "libidsig.test" - }, - { - "name": "librustutils_test" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "rustBinderTest" - }, - { "name": "unicode-xid_test_src_lib" }, { "name": "unicode-xid_test_tests_exhaustive_tests" - }, - { - "name": "virtualizationservice_device_test" } ], "presubmit-rust": [ { - "name": "ZipFuseTest" - }, - { - "name": "apkdmverity.test" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "diced_open_dice_cbor_test" - }, - { - "name": "diced_sample_inputs_test" - }, - { - "name": "diced_test" - }, - { - "name": "diced_utils_test" - }, - { - "name": "diced_vendor_test" - }, - { - "name": "doh_unit_test" - }, - { - "name": "keystore2_crypto_test_rust" - }, - { - "name": "keystore2_km_compat_test" - }, - { - "name": "keystore2_selinux_concurrency_test" - }, - { - "name": "keystore2_selinux_test" - }, - { - "name": "keystore2_test" - }, - { - "name": "keystore2_test_utils_test" - }, - { - "name": "keystore2_vintf_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libapkverify.integration_test" - }, - { - "name": "libapkverify.test" - }, - { - "name": "libcert_request_validator_tests" - }, - { - "name": "libidsig.test" - }, - { - "name": "librustutils_test" - }, - { - "name": "microdroid_manager_test" - }, - { - "name": "rustBinderTest" - }, - { "name": "unicode-xid_test_src_lib" }, { "name": "unicode-xid_test_tests_exhaustive_tests" - }, - { - "name": "virtualizationservice_device_test" } ] } diff --git a/patches/std.diff b/patches/std.diff index 73141c0..2c1f33b 100644 --- a/patches/std.diff +++ b/patches/std.diff @@ -1,8 +1,30 @@ +diff --git a/patches/std.diff b/patches/std.diff +index 8237bc9..e69de29 100644 +--- a/patches/std.diff ++++ b/patches/std.diff +@@ -1,17 +0,0 @@ +-diff --git a/src/lib.rs b/src/lib.rs +-index 01c81e2..927fc9a 100644 +---- a/src/lib.rs +-+++ b/src/lib.rs +-@@ -37,8 +37,9 @@ +- #![no_std] +- #![cfg_attr(feature = "bench", feature(test, unicode_internals))] +- +--#[cfg(test)] +--#[macro_use] +-+// #[cfg(test)] +-+// ANDROID: Unconditionally use std to allow building as a dylib. +-+// #[macro_use] +-+#[cfg(android_dylib)] +- extern crate std; +- +- #[cfg(feature = "bench")] diff --git a/src/lib.rs b/src/lib.rs -index 01c81e2..927fc9a 100644 +index af7015e..b4d5a1a 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -37,8 +37,9 @@ +@@ -37,8 +37,10 @@ #![no_std] #![cfg_attr(feature = "bench", feature(test, unicode_internals))] @@ -11,6 +33,7 @@ index 01c81e2..927fc9a 100644 +// #[cfg(test)] +// ANDROID: Unconditionally use std to allow building as a dylib. +// #[macro_use] ++#[cfg(android_dylib)] extern crate std; #[cfg(feature = "bench")] @@ -40,6 +40,7 @@ // #[cfg(test)] // ANDROID: Unconditionally use std to allow building as a dylib. // #[macro_use] +#[cfg(android_dylib)] extern crate std; #[cfg(feature = "bench")] diff --git a/src/tables.rs b/src/tables.rs index b7212a3..c12e76c 100644 --- a/src/tables.rs +++ b/src/tables.rs @@ -14,7 +14,7 @@ /// The version of [Unicode](http://www.unicode.org/) /// that this version of unicode-xid is based on. -pub const UNICODE_VERSION: (u64, u64, u64) = (13, 0, 0); +pub const UNICODE_VERSION: (u64, u64, u64) = (15, 0, 0); fn bsearch_range_table(c: char, r: &[(char, char)]) -> bool { use core::cmp::Ordering::{Equal, Greater, Less}; @@ -37,7 +37,7 @@ fn bsearch_range_table(c: char, r: &[(char, char)]) -> bool { } pub mod derived_property { - pub const XID_Continue_table: &[(char, char)] = &[ + static XID_Continue_table: &[(char, char)] = &[ ('\u{30}', '\u{39}'), ('\u{41}', '\u{5a}'), ('\u{5f}', '\u{5f}'), @@ -89,9 +89,9 @@ pub mod derived_property { ('\u{800}', '\u{82d}'), ('\u{840}', '\u{85b}'), ('\u{860}', '\u{86a}'), - ('\u{8a0}', '\u{8b4}'), - ('\u{8b6}', '\u{8c7}'), - ('\u{8d3}', '\u{8e1}'), + ('\u{870}', '\u{887}'), + ('\u{889}', '\u{88e}'), + ('\u{898}', '\u{8e1}'), ('\u{8e3}', '\u{963}'), ('\u{966}', '\u{96f}'), ('\u{971}', '\u{983}'), @@ -175,11 +175,12 @@ pub mod derived_property { ('\u{c0e}', '\u{c10}'), ('\u{c12}', '\u{c28}'), ('\u{c2a}', '\u{c39}'), - ('\u{c3d}', '\u{c44}'), + ('\u{c3c}', '\u{c44}'), ('\u{c46}', '\u{c48}'), ('\u{c4a}', '\u{c4d}'), ('\u{c55}', '\u{c56}'), ('\u{c58}', '\u{c5a}'), + ('\u{c5d}', '\u{c5d}'), ('\u{c60}', '\u{c63}'), ('\u{c66}', '\u{c6f}'), ('\u{c80}', '\u{c83}'), @@ -192,10 +193,10 @@ pub mod derived_property { ('\u{cc6}', '\u{cc8}'), ('\u{cca}', '\u{ccd}'), ('\u{cd5}', '\u{cd6}'), - ('\u{cde}', '\u{cde}'), + ('\u{cdd}', '\u{cde}'), ('\u{ce0}', '\u{ce3}'), ('\u{ce6}', '\u{cef}'), - ('\u{cf1}', '\u{cf2}'), + ('\u{cf1}', '\u{cf3}'), ('\u{d00}', '\u{d0c}'), ('\u{d0e}', '\u{d10}'), ('\u{d12}', '\u{d44}'), @@ -228,7 +229,7 @@ pub mod derived_property { ('\u{ea7}', '\u{ebd}'), ('\u{ec0}', '\u{ec4}'), ('\u{ec6}', '\u{ec6}'), - ('\u{ec8}', '\u{ecd}'), + ('\u{ec8}', '\u{ece}'), ('\u{ed0}', '\u{ed9}'), ('\u{edc}', '\u{edf}'), ('\u{f00}', '\u{f00}'), @@ -275,9 +276,8 @@ pub mod derived_property { ('\u{1681}', '\u{169a}'), ('\u{16a0}', '\u{16ea}'), ('\u{16ee}', '\u{16f8}'), - ('\u{1700}', '\u{170c}'), - ('\u{170e}', '\u{1714}'), - ('\u{1720}', '\u{1734}'), + ('\u{1700}', '\u{1715}'), + ('\u{171f}', '\u{1734}'), ('\u{1740}', '\u{1753}'), ('\u{1760}', '\u{176c}'), ('\u{176e}', '\u{1770}'), @@ -287,7 +287,7 @@ pub mod derived_property { ('\u{17dc}', '\u{17dd}'), ('\u{17e0}', '\u{17e9}'), ('\u{180b}', '\u{180d}'), - ('\u{1810}', '\u{1819}'), + ('\u{180f}', '\u{1819}'), ('\u{1820}', '\u{1878}'), ('\u{1880}', '\u{18aa}'), ('\u{18b0}', '\u{18f5}'), @@ -306,8 +306,8 @@ pub mod derived_property { ('\u{1a90}', '\u{1a99}'), ('\u{1aa7}', '\u{1aa7}'), ('\u{1ab0}', '\u{1abd}'), - ('\u{1abf}', '\u{1ac0}'), - ('\u{1b00}', '\u{1b4b}'), + ('\u{1abf}', '\u{1ace}'), + ('\u{1b00}', '\u{1b4c}'), ('\u{1b50}', '\u{1b59}'), ('\u{1b6b}', '\u{1b73}'), ('\u{1b80}', '\u{1bf3}'), @@ -319,8 +319,7 @@ pub mod derived_property { ('\u{1cbd}', '\u{1cbf}'), ('\u{1cd0}', '\u{1cd2}'), ('\u{1cd4}', '\u{1cfa}'), - ('\u{1d00}', '\u{1df9}'), - ('\u{1dfb}', '\u{1f15}'), + ('\u{1d00}', '\u{1f15}'), ('\u{1f18}', '\u{1f1d}'), ('\u{1f20}', '\u{1f45}'), ('\u{1f48}', '\u{1f4d}'), @@ -360,9 +359,7 @@ pub mod derived_property { ('\u{2145}', '\u{2149}'), ('\u{214e}', '\u{214e}'), ('\u{2160}', '\u{2188}'), - ('\u{2c00}', '\u{2c2e}'), - ('\u{2c30}', '\u{2c5e}'), - ('\u{2c60}', '\u{2ce4}'), + ('\u{2c00}', '\u{2ce4}'), ('\u{2ceb}', '\u{2cf3}'), ('\u{2d00}', '\u{2d25}'), ('\u{2d27}', '\u{2d27}'), @@ -393,8 +390,7 @@ pub mod derived_property { ('\u{31a0}', '\u{31bf}'), ('\u{31f0}', '\u{31ff}'), ('\u{3400}', '\u{4dbf}'), - ('\u{4e00}', '\u{9ffc}'), - ('\u{a000}', '\u{a48c}'), + ('\u{4e00}', '\u{a48c}'), ('\u{a4d0}', '\u{a4fd}'), ('\u{a500}', '\u{a60c}'), ('\u{a610}', '\u{a62b}'), @@ -403,9 +399,11 @@ pub mod derived_property { ('\u{a67f}', '\u{a6f1}'), ('\u{a717}', '\u{a71f}'), ('\u{a722}', '\u{a788}'), - ('\u{a78b}', '\u{a7bf}'), - ('\u{a7c2}', '\u{a7ca}'), - ('\u{a7f5}', '\u{a827}'), + ('\u{a78b}', '\u{a7ca}'), + ('\u{a7d0}', '\u{a7d1}'), + ('\u{a7d3}', '\u{a7d3}'), + ('\u{a7d5}', '\u{a7d9}'), + ('\u{a7f2}', '\u{a827}'), ('\u{a82c}', '\u{a82c}'), ('\u{a840}', '\u{a873}'), ('\u{a880}', '\u{a8c5}'), @@ -500,9 +498,20 @@ pub mod derived_property { ('\u{104d8}', '\u{104fb}'), ('\u{10500}', '\u{10527}'), ('\u{10530}', '\u{10563}'), + ('\u{10570}', '\u{1057a}'), + ('\u{1057c}', '\u{1058a}'), + ('\u{1058c}', '\u{10592}'), + ('\u{10594}', '\u{10595}'), + ('\u{10597}', '\u{105a1}'), + ('\u{105a3}', '\u{105b1}'), + ('\u{105b3}', '\u{105b9}'), + ('\u{105bb}', '\u{105bc}'), ('\u{10600}', '\u{10736}'), ('\u{10740}', '\u{10755}'), ('\u{10760}', '\u{10767}'), + ('\u{10780}', '\u{10785}'), + ('\u{10787}', '\u{107b0}'), + ('\u{107b2}', '\u{107ba}'), ('\u{10800}', '\u{10805}'), ('\u{10808}', '\u{10808}'), ('\u{1080a}', '\u{10835}'), @@ -540,14 +549,16 @@ pub mod derived_property { ('\u{10e80}', '\u{10ea9}'), ('\u{10eab}', '\u{10eac}'), ('\u{10eb0}', '\u{10eb1}'), - ('\u{10f00}', '\u{10f1c}'), + ('\u{10efd}', '\u{10f1c}'), ('\u{10f27}', '\u{10f27}'), ('\u{10f30}', '\u{10f50}'), + ('\u{10f70}', '\u{10f85}'), ('\u{10fb0}', '\u{10fc4}'), ('\u{10fe0}', '\u{10ff6}'), ('\u{11000}', '\u{11046}'), - ('\u{11066}', '\u{1106f}'), + ('\u{11066}', '\u{11075}'), ('\u{1107f}', '\u{110ba}'), + ('\u{110c2}', '\u{110c2}'), ('\u{110d0}', '\u{110e8}'), ('\u{110f0}', '\u{110f9}'), ('\u{11100}', '\u{11134}'), @@ -561,7 +572,7 @@ pub mod derived_property { ('\u{111dc}', '\u{111dc}'), ('\u{11200}', '\u{11211}'), ('\u{11213}', '\u{11237}'), - ('\u{1123e}', '\u{1123e}'), + ('\u{1123e}', '\u{11241}'), ('\u{11280}', '\u{11286}'), ('\u{11288}', '\u{11288}'), ('\u{1128a}', '\u{1128d}'), @@ -601,6 +612,7 @@ pub mod derived_property { ('\u{11700}', '\u{1171a}'), ('\u{1171d}', '\u{1172b}'), ('\u{11730}', '\u{11739}'), + ('\u{11740}', '\u{11746}'), ('\u{11800}', '\u{1183a}'), ('\u{118a0}', '\u{118e9}'), ('\u{118ff}', '\u{11906}'), @@ -619,7 +631,7 @@ pub mod derived_property { ('\u{11a47}', '\u{11a47}'), ('\u{11a50}', '\u{11a99}'), ('\u{11a9d}', '\u{11a9d}'), - ('\u{11ac0}', '\u{11af8}'), + ('\u{11ab0}', '\u{11af8}'), ('\u{11c00}', '\u{11c08}'), ('\u{11c0a}', '\u{11c36}'), ('\u{11c38}', '\u{11c40}'), @@ -641,15 +653,23 @@ pub mod derived_property { ('\u{11d93}', '\u{11d98}'), ('\u{11da0}', '\u{11da9}'), ('\u{11ee0}', '\u{11ef6}'), + ('\u{11f00}', '\u{11f10}'), + ('\u{11f12}', '\u{11f3a}'), + ('\u{11f3e}', '\u{11f42}'), + ('\u{11f50}', '\u{11f59}'), ('\u{11fb0}', '\u{11fb0}'), ('\u{12000}', '\u{12399}'), ('\u{12400}', '\u{1246e}'), ('\u{12480}', '\u{12543}'), - ('\u{13000}', '\u{1342e}'), + ('\u{12f90}', '\u{12ff0}'), + ('\u{13000}', '\u{1342f}'), + ('\u{13440}', '\u{13455}'), ('\u{14400}', '\u{14646}'), ('\u{16800}', '\u{16a38}'), ('\u{16a40}', '\u{16a5e}'), ('\u{16a60}', '\u{16a69}'), + ('\u{16a70}', '\u{16abe}'), + ('\u{16ac0}', '\u{16ac9}'), ('\u{16ad0}', '\u{16aed}'), ('\u{16af0}', '\u{16af4}'), ('\u{16b00}', '\u{16b36}'), @@ -667,8 +687,13 @@ pub mod derived_property { ('\u{17000}', '\u{187f7}'), ('\u{18800}', '\u{18cd5}'), ('\u{18d00}', '\u{18d08}'), - ('\u{1b000}', '\u{1b11e}'), + ('\u{1aff0}', '\u{1aff3}'), + ('\u{1aff5}', '\u{1affb}'), + ('\u{1affd}', '\u{1affe}'), + ('\u{1b000}', '\u{1b122}'), + ('\u{1b132}', '\u{1b132}'), ('\u{1b150}', '\u{1b152}'), + ('\u{1b155}', '\u{1b155}'), ('\u{1b164}', '\u{1b167}'), ('\u{1b170}', '\u{1b2fb}'), ('\u{1bc00}', '\u{1bc6a}'), @@ -676,6 +701,8 @@ pub mod derived_property { ('\u{1bc80}', '\u{1bc88}'), ('\u{1bc90}', '\u{1bc99}'), ('\u{1bc9d}', '\u{1bc9e}'), + ('\u{1cf00}', '\u{1cf2d}'), + ('\u{1cf30}', '\u{1cf46}'), ('\u{1d165}', '\u{1d169}'), ('\u{1d16d}', '\u{1d172}'), ('\u{1d17b}', '\u{1d182}'), @@ -719,16 +746,26 @@ pub mod derived_property { ('\u{1da84}', '\u{1da84}'), ('\u{1da9b}', '\u{1da9f}'), ('\u{1daa1}', '\u{1daaf}'), + ('\u{1df00}', '\u{1df1e}'), + ('\u{1df25}', '\u{1df2a}'), ('\u{1e000}', '\u{1e006}'), ('\u{1e008}', '\u{1e018}'), ('\u{1e01b}', '\u{1e021}'), ('\u{1e023}', '\u{1e024}'), ('\u{1e026}', '\u{1e02a}'), + ('\u{1e030}', '\u{1e06d}'), + ('\u{1e08f}', '\u{1e08f}'), ('\u{1e100}', '\u{1e12c}'), ('\u{1e130}', '\u{1e13d}'), ('\u{1e140}', '\u{1e149}'), ('\u{1e14e}', '\u{1e14e}'), + ('\u{1e290}', '\u{1e2ae}'), ('\u{1e2c0}', '\u{1e2f9}'), + ('\u{1e4d0}', '\u{1e4f9}'), + ('\u{1e7e0}', '\u{1e7e6}'), + ('\u{1e7e8}', '\u{1e7eb}'), + ('\u{1e7ed}', '\u{1e7ee}'), + ('\u{1e7f0}', '\u{1e7fe}'), ('\u{1e800}', '\u{1e8c4}'), ('\u{1e8d0}', '\u{1e8d6}'), ('\u{1e900}', '\u{1e94b}'), @@ -767,13 +804,14 @@ pub mod derived_property { ('\u{1eea5}', '\u{1eea9}'), ('\u{1eeab}', '\u{1eebb}'), ('\u{1fbf0}', '\u{1fbf9}'), - ('\u{20000}', '\u{2a6dd}'), - ('\u{2a700}', '\u{2b734}'), + ('\u{20000}', '\u{2a6df}'), + ('\u{2a700}', '\u{2b739}'), ('\u{2b740}', '\u{2b81d}'), ('\u{2b820}', '\u{2cea1}'), ('\u{2ceb0}', '\u{2ebe0}'), ('\u{2f800}', '\u{2fa1d}'), ('\u{30000}', '\u{3134a}'), + ('\u{31350}', '\u{323af}'), ('\u{e0100}', '\u{e01ef}'), ]; @@ -781,7 +819,7 @@ pub mod derived_property { super::bsearch_range_table(c, XID_Continue_table) } - pub const XID_Start_table: &[(char, char)] = &[ + static XID_Start_table: &[(char, char)] = &[ ('\u{41}', '\u{5a}'), ('\u{61}', '\u{7a}'), ('\u{aa}', '\u{aa}'), @@ -831,8 +869,9 @@ pub mod derived_property { ('\u{828}', '\u{828}'), ('\u{840}', '\u{858}'), ('\u{860}', '\u{86a}'), - ('\u{8a0}', '\u{8b4}'), - ('\u{8b6}', '\u{8c7}'), + ('\u{870}', '\u{887}'), + ('\u{889}', '\u{88e}'), + ('\u{8a0}', '\u{8c9}'), ('\u{904}', '\u{939}'), ('\u{93d}', '\u{93d}'), ('\u{950}', '\u{950}'), @@ -897,6 +936,7 @@ pub mod derived_property { ('\u{c2a}', '\u{c39}'), ('\u{c3d}', '\u{c3d}'), ('\u{c58}', '\u{c5a}'), + ('\u{c5d}', '\u{c5d}'), ('\u{c60}', '\u{c61}'), ('\u{c80}', '\u{c80}'), ('\u{c85}', '\u{c8c}'), @@ -905,7 +945,7 @@ pub mod derived_property { ('\u{caa}', '\u{cb3}'), ('\u{cb5}', '\u{cb9}'), ('\u{cbd}', '\u{cbd}'), - ('\u{cde}', '\u{cde}'), + ('\u{cdd}', '\u{cde}'), ('\u{ce0}', '\u{ce1}'), ('\u{cf1}', '\u{cf2}'), ('\u{d04}', '\u{d0c}'), @@ -976,9 +1016,8 @@ pub mod derived_property { ('\u{1681}', '\u{169a}'), ('\u{16a0}', '\u{16ea}'), ('\u{16ee}', '\u{16f8}'), - ('\u{1700}', '\u{170c}'), - ('\u{170e}', '\u{1711}'), - ('\u{1720}', '\u{1731}'), + ('\u{1700}', '\u{1711}'), + ('\u{171f}', '\u{1731}'), ('\u{1740}', '\u{1751}'), ('\u{1760}', '\u{176c}'), ('\u{176e}', '\u{1770}'), @@ -998,7 +1037,7 @@ pub mod derived_property { ('\u{1a20}', '\u{1a54}'), ('\u{1aa7}', '\u{1aa7}'), ('\u{1b05}', '\u{1b33}'), - ('\u{1b45}', '\u{1b4b}'), + ('\u{1b45}', '\u{1b4c}'), ('\u{1b83}', '\u{1ba0}'), ('\u{1bae}', '\u{1baf}'), ('\u{1bba}', '\u{1be5}'), @@ -1048,9 +1087,7 @@ pub mod derived_property { ('\u{2145}', '\u{2149}'), ('\u{214e}', '\u{214e}'), ('\u{2160}', '\u{2188}'), - ('\u{2c00}', '\u{2c2e}'), - ('\u{2c30}', '\u{2c5e}'), - ('\u{2c60}', '\u{2ce4}'), + ('\u{2c00}', '\u{2ce4}'), ('\u{2ceb}', '\u{2cee}'), ('\u{2cf2}', '\u{2cf3}'), ('\u{2d00}', '\u{2d25}'), @@ -1080,8 +1117,7 @@ pub mod derived_property { ('\u{31a0}', '\u{31bf}'), ('\u{31f0}', '\u{31ff}'), ('\u{3400}', '\u{4dbf}'), - ('\u{4e00}', '\u{9ffc}'), - ('\u{a000}', '\u{a48c}'), + ('\u{4e00}', '\u{a48c}'), ('\u{a4d0}', '\u{a4fd}'), ('\u{a500}', '\u{a60c}'), ('\u{a610}', '\u{a61f}'), @@ -1091,9 +1127,11 @@ pub mod derived_property { ('\u{a6a0}', '\u{a6ef}'), ('\u{a717}', '\u{a71f}'), ('\u{a722}', '\u{a788}'), - ('\u{a78b}', '\u{a7bf}'), - ('\u{a7c2}', '\u{a7ca}'), - ('\u{a7f5}', '\u{a801}'), + ('\u{a78b}', '\u{a7ca}'), + ('\u{a7d0}', '\u{a7d1}'), + ('\u{a7d3}', '\u{a7d3}'), + ('\u{a7d5}', '\u{a7d9}'), + ('\u{a7f2}', '\u{a801}'), ('\u{a803}', '\u{a805}'), ('\u{a807}', '\u{a80a}'), ('\u{a80c}', '\u{a822}'), @@ -1189,9 +1227,20 @@ pub mod derived_property { ('\u{104d8}', '\u{104fb}'), ('\u{10500}', '\u{10527}'), ('\u{10530}', '\u{10563}'), + ('\u{10570}', '\u{1057a}'), + ('\u{1057c}', '\u{1058a}'), + ('\u{1058c}', '\u{10592}'), + ('\u{10594}', '\u{10595}'), + ('\u{10597}', '\u{105a1}'), + ('\u{105a3}', '\u{105b1}'), + ('\u{105b3}', '\u{105b9}'), + ('\u{105bb}', '\u{105bc}'), ('\u{10600}', '\u{10736}'), ('\u{10740}', '\u{10755}'), ('\u{10760}', '\u{10767}'), + ('\u{10780}', '\u{10785}'), + ('\u{10787}', '\u{107b0}'), + ('\u{107b2}', '\u{107ba}'), ('\u{10800}', '\u{10805}'), ('\u{10808}', '\u{10808}'), ('\u{1080a}', '\u{10835}'), @@ -1227,9 +1276,12 @@ pub mod derived_property { ('\u{10f00}', '\u{10f1c}'), ('\u{10f27}', '\u{10f27}'), ('\u{10f30}', '\u{10f45}'), + ('\u{10f70}', '\u{10f81}'), ('\u{10fb0}', '\u{10fc4}'), ('\u{10fe0}', '\u{10ff6}'), ('\u{11003}', '\u{11037}'), + ('\u{11071}', '\u{11072}'), + ('\u{11075}', '\u{11075}'), ('\u{11083}', '\u{110af}'), ('\u{110d0}', '\u{110e8}'), ('\u{11103}', '\u{11126}'), @@ -1243,6 +1295,7 @@ pub mod derived_property { ('\u{111dc}', '\u{111dc}'), ('\u{11200}', '\u{11211}'), ('\u{11213}', '\u{1122b}'), + ('\u{1123f}', '\u{11240}'), ('\u{11280}', '\u{11286}'), ('\u{11288}', '\u{11288}'), ('\u{1128a}', '\u{1128d}'), @@ -1271,6 +1324,7 @@ pub mod derived_property { ('\u{11680}', '\u{116aa}'), ('\u{116b8}', '\u{116b8}'), ('\u{11700}', '\u{1171a}'), + ('\u{11740}', '\u{11746}'), ('\u{11800}', '\u{1182b}'), ('\u{118a0}', '\u{118df}'), ('\u{118ff}', '\u{11906}'), @@ -1290,7 +1344,7 @@ pub mod derived_property { ('\u{11a50}', '\u{11a50}'), ('\u{11a5c}', '\u{11a89}'), ('\u{11a9d}', '\u{11a9d}'), - ('\u{11ac0}', '\u{11af8}'), + ('\u{11ab0}', '\u{11af8}'), ('\u{11c00}', '\u{11c08}'), ('\u{11c0a}', '\u{11c2e}'), ('\u{11c40}', '\u{11c40}'), @@ -1304,14 +1358,20 @@ pub mod derived_property { ('\u{11d6a}', '\u{11d89}'), ('\u{11d98}', '\u{11d98}'), ('\u{11ee0}', '\u{11ef2}'), + ('\u{11f02}', '\u{11f02}'), + ('\u{11f04}', '\u{11f10}'), + ('\u{11f12}', '\u{11f33}'), ('\u{11fb0}', '\u{11fb0}'), ('\u{12000}', '\u{12399}'), ('\u{12400}', '\u{1246e}'), ('\u{12480}', '\u{12543}'), - ('\u{13000}', '\u{1342e}'), + ('\u{12f90}', '\u{12ff0}'), + ('\u{13000}', '\u{1342f}'), + ('\u{13441}', '\u{13446}'), ('\u{14400}', '\u{14646}'), ('\u{16800}', '\u{16a38}'), ('\u{16a40}', '\u{16a5e}'), + ('\u{16a70}', '\u{16abe}'), ('\u{16ad0}', '\u{16aed}'), ('\u{16b00}', '\u{16b2f}'), ('\u{16b40}', '\u{16b43}'), @@ -1326,8 +1386,13 @@ pub mod derived_property { ('\u{17000}', '\u{187f7}'), ('\u{18800}', '\u{18cd5}'), ('\u{18d00}', '\u{18d08}'), - ('\u{1b000}', '\u{1b11e}'), + ('\u{1aff0}', '\u{1aff3}'), + ('\u{1aff5}', '\u{1affb}'), + ('\u{1affd}', '\u{1affe}'), + ('\u{1b000}', '\u{1b122}'), + ('\u{1b132}', '\u{1b132}'), ('\u{1b150}', '\u{1b152}'), + ('\u{1b155}', '\u{1b155}'), ('\u{1b164}', '\u{1b167}'), ('\u{1b170}', '\u{1b2fb}'), ('\u{1bc00}', '\u{1bc6a}'), @@ -1364,10 +1429,19 @@ pub mod derived_property { ('\u{1d78a}', '\u{1d7a8}'), ('\u{1d7aa}', '\u{1d7c2}'), ('\u{1d7c4}', '\u{1d7cb}'), + ('\u{1df00}', '\u{1df1e}'), + ('\u{1df25}', '\u{1df2a}'), + ('\u{1e030}', '\u{1e06d}'), ('\u{1e100}', '\u{1e12c}'), ('\u{1e137}', '\u{1e13d}'), ('\u{1e14e}', '\u{1e14e}'), + ('\u{1e290}', '\u{1e2ad}'), ('\u{1e2c0}', '\u{1e2eb}'), + ('\u{1e4d0}', '\u{1e4eb}'), + ('\u{1e7e0}', '\u{1e7e6}'), + ('\u{1e7e8}', '\u{1e7eb}'), + ('\u{1e7ed}', '\u{1e7ee}'), + ('\u{1e7f0}', '\u{1e7fe}'), ('\u{1e800}', '\u{1e8c4}'), ('\u{1e900}', '\u{1e943}'), ('\u{1e94b}', '\u{1e94b}'), @@ -1404,13 +1478,14 @@ pub mod derived_property { ('\u{1eea1}', '\u{1eea3}'), ('\u{1eea5}', '\u{1eea9}'), ('\u{1eeab}', '\u{1eebb}'), - ('\u{20000}', '\u{2a6dd}'), - ('\u{2a700}', '\u{2b734}'), + ('\u{20000}', '\u{2a6df}'), + ('\u{2a700}', '\u{2b739}'), ('\u{2b740}', '\u{2b81d}'), ('\u{2b820}', '\u{2cea1}'), ('\u{2ceb0}', '\u{2ebe0}'), ('\u{2f800}', '\u{2fa1d}'), ('\u{30000}', '\u{3134a}'), + ('\u{31350}', '\u{323af}'), ]; pub fn XID_Start(c: char) -> bool { |