Snap for 10447354 from e7a2c2628cfe6bd7de827397d1ba2596f9f98014 to mainline-cellbroadcast-release
Change-Id: I009782644311592bde5d84e6e538b3026242fa0a
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
new file mode 100644
index 0000000..1af7666
--- /dev/null
+++ b/.cargo_vcs_info.json
@@ -0,0 +1,6 @@
+{
+ "git": {
+ "sha1": "3689c96bdbf1f9660de43925f278b977e9a4edc6"
+ },
+ "path_in_vcs": "ucd-trie"
+}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 1699876..fe68744 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --run --host-first-multilib.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: ["external_rust_crates_ucd-trie_license"],
}
@@ -43,7 +41,7 @@
name: "libucd_trie",
crate_name: "ucd_trie",
cargo_env_compat: true,
- cargo_pkg_version: "0.1.3",
+ cargo_pkg_version: "0.1.5",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -51,4 +49,8 @@
"std",
],
compile_multilib: "first",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
}
diff --git a/Cargo.toml b/Cargo.toml
index 491d8a8..2e25e6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,26 +3,34 @@
# 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]
edition = "2018"
name = "ucd-trie"
-version = "0.1.3"
+version = "0.1.5"
authors = ["Andrew Gallant <jamslam@gmail.com>"]
-description = "A trie for storing Unicode codepoint sets and maps.\n"
+description = """
+A trie for storing Unicode codepoint sets and maps.
+"""
homepage = "https://github.com/BurntSushi/ucd-generate"
documentation = "https://docs.rs/ucd-trie"
readme = "README.md"
-keywords = ["unicode", "database", "character", "codepoint", "trie"]
-license = "MIT/Apache-2.0"
+keywords = [
+ "unicode",
+ "database",
+ "character",
+ "codepoint",
+ "trie",
+]
+license = "MIT OR Apache-2.0"
repository = "https://github.com/BurntSushi/ucd-generate"
-[dev-dependencies.lazy_static]
+
+[dev-dependencies.once_cell]
version = "1"
[features]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index da540b6..5e5993e 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "ucd-trie"
-version = "0.1.3" #:version
+version = "0.1.5" #:version
authors = ["Andrew Gallant <jamslam@gmail.com>"]
description = """
A trie for storing Unicode codepoint sets and maps.
@@ -10,11 +10,11 @@
repository = "https://github.com/BurntSushi/ucd-generate"
readme = "README.md"
keywords = ["unicode", "database", "character", "codepoint", "trie"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
edition = "2018"
[dev-dependencies]
-lazy_static = "1"
+once_cell = "1"
[features]
default = ["std"]
diff --git a/METADATA b/METADATA
index c2be09c..895d0af 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update rust/crates/ucd-trie
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
name: "ucd-trie"
description: "A trie for storing Unicode codepoint sets and maps."
third_party {
@@ -7,14 +11,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.3.crate"
+ value: "https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.5.crate"
}
- version: "0.1.3"
- # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+ version: "0.1.5"
license_type: NOTICE
last_upgrade_date {
year: 2022
- month: 1
- day: 27
+ month: 12
+ day: 19
}
}
diff --git a/README.md b/README.md
index b70fbfc..af09793 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
A library that provides compressed trie sets specifically tailored toward
representing boolean Unicode character properties.
-[](https://travis-ci.org/BurntSushi/ucd-generate)
-[](https://crates.io/crates/ucd-trie)
+[](https://github.com/BurntSushi/ucd-generate/actions)
+[](https://crates.io/crates/ucd-trie)
### Documentation
@@ -16,7 +16,7 @@
This project is licensed under either of
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
- http://www.apache.org/licenses/LICENSE-2.0)
+ https://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
- http://opensource.org/licenses/MIT)
+ https://opensource.org/licenses/MIT)
at your option.
diff --git a/benches/bench.rs b/benches/bench.rs
index 53c04b9..edbbefb 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -1,21 +1,18 @@
#![feature(test)]
-#[macro_use]
-extern crate lazy_static;
extern crate test;
+use once_cell::sync::Lazy;
use ucd_trie::TrieSetOwned;
#[bench]
fn bench_trie_set(b: &mut test::Bencher) {
const CHARS: &'static [char] = &['a', 'β', '☃', '😼'];
// const CHARS: &'static [char] = &['a'];
- lazy_static! {
- static ref SET: TrieSetOwned =
- TrieSetOwned::from_scalars(CHARS).unwrap();
- }
+ static SET: Lazy<TrieSetOwned> =
+ Lazy::new(|| TrieSetOwned::from_scalars(CHARS).unwrap());
- let set = &*SET;
+ let set = Lazy::force(&SET);
let mut i = 0;
b.iter(|| {
let c = CHARS[i];
diff --git a/src/general_category.rs b/src/general_category.rs
index 63383a9..53c54b7 100644
--- a/src/general_category.rs
+++ b/src/general_category.rs
@@ -1,8 +1,10 @@
// DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
//
-// ucd-generate general-category ./ucd-13.0.0
+// ucd-generate general-category ucd-14.0.0
//
-// ucd-generate 0.2.6 is available on crates.io.
+// Unicode version: 14.0.0.
+//
+// ucd-generate 0.2.10 is available on crates.io.
pub const BY_NAME: &'static [(&'static str, &'static [(u32, u32)])] = &[
("Cased_Letter", CASED_LETTER),
@@ -115,9 +117,7 @@
(8517, 8521),
(8526, 8526),
(8579, 8580),
- (11264, 11310),
- (11312, 11358),
- (11360, 11387),
+ (11264, 11387),
(11390, 11492),
(11499, 11502),
(11506, 11507),
@@ -129,8 +129,10 @@
(42786, 42863),
(42865, 42887),
(42891, 42894),
- (42896, 42943),
- (42946, 42954),
+ (42896, 42954),
+ (42960, 42961),
+ (42963, 42963),
+ (42965, 42969),
(42997, 42998),
(43002, 43002),
(43824, 43866),
@@ -143,6 +145,14 @@
(66560, 66639),
(66736, 66771),
(66776, 66811),
+ (66928, 66938),
+ (66940, 66954),
+ (66956, 66962),
+ (66964, 66965),
+ (66967, 66977),
+ (66979, 66993),
+ (66995, 67001),
+ (67003, 67004),
(68736, 68786),
(68800, 68850),
(71840, 71903),
@@ -177,6 +187,8 @@
(120714, 120744),
(120746, 120770),
(120772, 120779),
+ (122624, 122633),
+ (122635, 122654),
(125184, 125251),
];
@@ -224,6 +236,10 @@
(11813, 11813),
(11815, 11815),
(11817, 11817),
+ (11862, 11862),
+ (11864, 11864),
+ (11866, 11866),
+ (11868, 11868),
(12297, 12297),
(12299, 12299),
(12301, 12301),
@@ -278,7 +294,7 @@
(3065, 3065),
(3647, 3647),
(6107, 6107),
- (8352, 8383),
+ (8352, 8384),
(43064, 43064),
(65020, 65020),
(65129, 65129),
@@ -301,6 +317,7 @@
(11802, 11802),
(11834, 11835),
(11840, 11840),
+ (11869, 11869),
(12316, 12316),
(12336, 12336),
(12448, 12448),
@@ -367,6 +384,7 @@
(73040, 73049),
(73120, 73129),
(92768, 92777),
+ (92864, 92873),
(93008, 93017),
(120782, 120831),
(123200, 123209),
@@ -397,6 +415,7 @@
(1564, 1564),
(1757, 1757),
(1807, 1807),
+ (2192, 2193),
(2274, 2274),
(6158, 6158),
(8203, 8207),
@@ -478,8 +497,9 @@
(2088, 2088),
(2112, 2136),
(2144, 2154),
- (2208, 2228),
- (2230, 2247),
+ (2160, 2183),
+ (2185, 2190),
+ (2208, 2249),
(2308, 2361),
(2365, 2365),
(2384, 2384),
@@ -544,6 +564,7 @@
(3114, 3129),
(3133, 3133),
(3160, 3162),
+ (3165, 3165),
(3168, 3169),
(3200, 3200),
(3205, 3212),
@@ -552,7 +573,7 @@
(3242, 3251),
(3253, 3257),
(3261, 3261),
- (3294, 3294),
+ (3293, 3294),
(3296, 3297),
(3313, 3314),
(3332, 3340),
@@ -623,9 +644,8 @@
(5761, 5786),
(5792, 5866),
(5873, 5880),
- (5888, 5900),
- (5902, 5905),
- (5920, 5937),
+ (5888, 5905),
+ (5919, 5937),
(5952, 5969),
(5984, 5996),
(5998, 6000),
@@ -646,7 +666,7 @@
(6688, 6740),
(6823, 6823),
(6917, 6963),
- (6981, 6987),
+ (6981, 6988),
(7043, 7072),
(7086, 7087),
(7098, 7141),
@@ -697,9 +717,7 @@
(8517, 8521),
(8526, 8526),
(8579, 8580),
- (11264, 11310),
- (11312, 11358),
- (11360, 11492),
+ (11264, 11492),
(11499, 11502),
(11506, 11507),
(11520, 11557),
@@ -729,8 +747,7 @@
(12704, 12735),
(12784, 12799),
(13312, 19903),
- (19968, 40956),
- (40960, 42124),
+ (19968, 42124),
(42192, 42237),
(42240, 42508),
(42512, 42527),
@@ -740,9 +757,11 @@
(42656, 42725),
(42775, 42783),
(42786, 42888),
- (42891, 42943),
- (42946, 42954),
- (42997, 43009),
+ (42891, 42954),
+ (42960, 42961),
+ (42963, 42963),
+ (42965, 42969),
+ (42994, 43009),
(43011, 43013),
(43015, 43018),
(43020, 43042),
@@ -830,9 +849,20 @@
(66776, 66811),
(66816, 66855),
(66864, 66915),
+ (66928, 66938),
+ (66940, 66954),
+ (66956, 66962),
+ (66964, 66965),
+ (66967, 66977),
+ (66979, 66993),
+ (66995, 67001),
+ (67003, 67004),
(67072, 67382),
(67392, 67413),
(67424, 67431),
+ (67456, 67461),
+ (67463, 67504),
+ (67506, 67514),
(67584, 67589),
(67592, 67592),
(67594, 67637),
@@ -868,9 +898,12 @@
(69376, 69404),
(69415, 69415),
(69424, 69445),
+ (69488, 69505),
(69552, 69572),
(69600, 69622),
(69635, 69687),
+ (69745, 69746),
+ (69749, 69749),
(69763, 69807),
(69840, 69864),
(69891, 69926),
@@ -912,6 +945,7 @@
(71296, 71338),
(71352, 71352),
(71424, 71450),
+ (71488, 71494),
(71680, 71723),
(71840, 71903),
(71935, 71942),
@@ -931,7 +965,7 @@
(72272, 72272),
(72284, 72329),
(72349, 72349),
- (72384, 72440),
+ (72368, 72440),
(72704, 72712),
(72714, 72750),
(72768, 72768),
@@ -948,10 +982,12 @@
(73648, 73648),
(73728, 74649),
(74880, 75075),
+ (77712, 77808),
(77824, 78894),
(82944, 83526),
(92160, 92728),
(92736, 92766),
+ (92784, 92862),
(92880, 92909),
(92928, 92975),
(92992, 92995),
@@ -966,7 +1002,10 @@
(94208, 100343),
(100352, 101589),
(101632, 101640),
- (110592, 110878),
+ (110576, 110579),
+ (110581, 110587),
+ (110589, 110590),
+ (110592, 110882),
(110928, 110930),
(110948, 110951),
(110960, 111355),
@@ -1004,10 +1043,16 @@
(120714, 120744),
(120746, 120770),
(120772, 120779),
+ (122624, 122654),
(123136, 123180),
(123191, 123197),
(123214, 123214),
+ (123536, 123565),
(123584, 123627),
+ (124896, 124902),
+ (124904, 124907),
+ (124909, 124910),
+ (124912, 124926),
(124928, 125124),
(125184, 125251),
(125259, 125259),
@@ -1044,8 +1089,8 @@
(126625, 126627),
(126629, 126633),
(126635, 126651),
- (131072, 173789),
- (173824, 177972),
+ (131072, 173791),
+ (173824, 177976),
(177984, 178205),
(178208, 183969),
(183984, 191456),
@@ -1502,7 +1547,7 @@
(8518, 8521),
(8526, 8526),
(8580, 8580),
- (11312, 11358),
+ (11312, 11359),
(11361, 11361),
(11365, 11366),
(11368, 11368),
@@ -1671,9 +1716,15 @@
(42939, 42939),
(42941, 42941),
(42943, 42943),
+ (42945, 42945),
(42947, 42947),
(42952, 42952),
(42954, 42954),
+ (42961, 42961),
+ (42963, 42963),
+ (42965, 42965),
+ (42967, 42967),
+ (42969, 42969),
(42998, 42998),
(43002, 43002),
(43824, 43866),
@@ -1684,6 +1735,10 @@
(65345, 65370),
(66600, 66639),
(66776, 66811),
+ (66967, 66977),
+ (66979, 66993),
+ (66995, 67001),
+ (67003, 67004),
(68800, 68850),
(71872, 71903),
(93792, 93823),
@@ -1715,6 +1770,8 @@
(120746, 120770),
(120772, 120777),
(120779, 120779),
+ (122624, 122633),
+ (122635, 122654),
(125218, 125251),
];
@@ -1743,7 +1800,8 @@
(2085, 2087),
(2089, 2093),
(2137, 2139),
- (2259, 2273),
+ (2200, 2207),
+ (2250, 2273),
(2275, 2307),
(2362, 2364),
(2366, 2383),
@@ -1785,6 +1843,7 @@
(3018, 3021),
(3031, 3031),
(3072, 3076),
+ (3132, 3132),
(3134, 3140),
(3142, 3144),
(3146, 3149),
@@ -1836,13 +1895,14 @@
(4239, 4239),
(4250, 4253),
(4957, 4959),
- (5906, 5908),
+ (5906, 5909),
(5938, 5940),
(5970, 5971),
(6002, 6003),
(6068, 6099),
(6109, 6109),
(6155, 6157),
+ (6159, 6159),
(6277, 6278),
(6313, 6313),
(6432, 6443),
@@ -1851,7 +1911,7 @@
(6741, 6750),
(6752, 6780),
(6783, 6783),
- (6832, 6848),
+ (6832, 6862),
(6912, 6916),
(6964, 6980),
(7019, 7027),
@@ -1864,8 +1924,7 @@
(7405, 7405),
(7412, 7412),
(7415, 7417),
- (7616, 7673),
- (7675, 7679),
+ (7616, 7679),
(8400, 8432),
(11503, 11505),
(11647, 11647),
@@ -1918,10 +1977,14 @@
(68900, 68903),
(69291, 69292),
(69446, 69456),
+ (69506, 69509),
(69632, 69634),
(69688, 69702),
+ (69744, 69744),
+ (69747, 69748),
(69759, 69762),
(69808, 69818),
+ (69826, 69826),
(69888, 69890),
(69927, 69940),
(69957, 69958),
@@ -1987,6 +2050,8 @@
(94180, 94180),
(94192, 94193),
(113821, 113822),
+ (118528, 118573),
+ (118576, 118598),
(119141, 119145),
(119149, 119154),
(119163, 119170),
@@ -2005,6 +2070,7 @@
(122915, 122916),
(122918, 122922),
(123184, 123190),
+ (123566, 123566),
(123628, 123631),
(125136, 125142),
(125252, 125258),
@@ -2094,6 +2160,7 @@
(2074, 2074),
(2084, 2084),
(2088, 2088),
+ (2249, 2249),
(2417, 2417),
(3654, 3654),
(3782, 3782),
@@ -2124,6 +2191,7 @@
(42775, 42783),
(42864, 42864),
(42888, 42888),
+ (42994, 42996),
(43000, 43001),
(43471, 43471),
(43494, 43494),
@@ -2134,10 +2202,16 @@
(43881, 43881),
(65392, 65392),
(65438, 65439),
+ (67456, 67461),
+ (67463, 67504),
+ (67506, 67514),
(92992, 92995),
(94099, 94111),
(94176, 94177),
(94179, 94179),
+ (110576, 110579),
+ (110581, 110587),
+ (110589, 110590),
(123191, 123197),
(125259, 125259),
];
@@ -2156,6 +2230,7 @@
(751, 767),
(885, 885),
(900, 901),
+ (2184, 2184),
(8125, 8125),
(8127, 8129),
(8141, 8143),
@@ -2168,7 +2243,7 @@
(42889, 42890),
(43867, 43867),
(43882, 43883),
- (64434, 64449),
+ (64434, 64450),
(65342, 65342),
(65344, 65344),
(65507, 65507),
@@ -2200,7 +2275,8 @@
(2085, 2087),
(2089, 2093),
(2137, 2139),
- (2259, 2273),
+ (2200, 2207),
+ (2250, 2273),
(2275, 2306),
(2362, 2362),
(2364, 2364),
@@ -2241,6 +2317,7 @@
(3021, 3021),
(3072, 3072),
(3076, 3076),
+ (3132, 3132),
(3134, 3136),
(3142, 3144),
(3146, 3149),
@@ -2290,7 +2367,7 @@
(4253, 4253),
(4957, 4959),
(5906, 5908),
- (5938, 5940),
+ (5938, 5939),
(5970, 5971),
(6002, 6003),
(6068, 6069),
@@ -2299,6 +2376,7 @@
(6089, 6099),
(6109, 6109),
(6155, 6157),
+ (6159, 6159),
(6277, 6278),
(6313, 6313),
(6432, 6434),
@@ -2315,7 +2393,7 @@
(6771, 6780),
(6783, 6783),
(6832, 6845),
- (6847, 6848),
+ (6847, 6862),
(6912, 6915),
(6964, 6964),
(6966, 6970),
@@ -2338,8 +2416,7 @@
(7405, 7405),
(7412, 7412),
(7416, 7417),
- (7616, 7673),
- (7675, 7679),
+ (7616, 7679),
(8400, 8412),
(8417, 8417),
(8421, 8432),
@@ -2398,11 +2475,15 @@
(68900, 68903),
(69291, 69292),
(69446, 69456),
+ (69506, 69509),
(69633, 69633),
(69688, 69702),
+ (69744, 69744),
+ (69747, 69748),
(69759, 69761),
(69811, 69814),
(69817, 69818),
+ (69826, 69826),
(69888, 69890),
(69927, 69931),
(69933, 69940),
@@ -2482,6 +2563,8 @@
(94095, 94098),
(94180, 94180),
(113821, 113822),
+ (118528, 118573),
+ (118576, 118598),
(119143, 119145),
(119163, 119170),
(119173, 119179),
@@ -2499,6 +2582,7 @@
(122915, 122916),
(122918, 122922),
(123184, 123190),
+ (123566, 123566),
(123628, 123631),
(125136, 125142),
(125252, 125258),
@@ -2622,6 +2706,7 @@
(73664, 73684),
(74752, 74862),
(92768, 92777),
+ (92864, 92873),
(93008, 93017),
(93019, 93025),
(93824, 93846),
@@ -2688,6 +2773,10 @@
(11814, 11814),
(11816, 11816),
(11842, 11842),
+ (11861, 11861),
+ (11863, 11863),
+ (11865, 11865),
+ (11867, 11867),
(12296, 12296),
(12298, 12298),
(12300, 12300),
@@ -2735,7 +2824,7 @@
(1480, 1487),
(1515, 1518),
(1525, 1541),
- (1564, 1565),
+ (1564, 1564),
(1757, 1757),
(1806, 1807),
(1867, 1868),
@@ -2745,9 +2834,8 @@
(2111, 2111),
(2140, 2141),
(2143, 2143),
- (2155, 2207),
- (2229, 2229),
- (2248, 2258),
+ (2155, 2159),
+ (2191, 2199),
(2274, 2274),
(2436, 2436),
(2445, 2446),
@@ -2826,12 +2914,13 @@
(3085, 3085),
(3089, 3089),
(3113, 3113),
- (3130, 3132),
+ (3130, 3131),
(3141, 3141),
(3145, 3145),
(3150, 3156),
(3159, 3159),
- (3163, 3167),
+ (3163, 3164),
+ (3166, 3167),
(3172, 3173),
(3184, 3190),
(3213, 3213),
@@ -2842,7 +2931,7 @@
(3269, 3269),
(3273, 3273),
(3278, 3284),
- (3287, 3293),
+ (3287, 3292),
(3295, 3295),
(3300, 3301),
(3312, 3312),
@@ -2910,8 +2999,7 @@
(5118, 5119),
(5789, 5791),
(5881, 5887),
- (5901, 5901),
- (5909, 5919),
+ (5910, 5918),
(5943, 5951),
(5972, 5983),
(5997, 5997),
@@ -2920,7 +3008,7 @@
(6110, 6111),
(6122, 6127),
(6138, 6143),
- (6158, 6159),
+ (6158, 6158),
(6170, 6175),
(6265, 6271),
(6315, 6319),
@@ -2940,9 +3028,9 @@
(6794, 6799),
(6810, 6815),
(6830, 6831),
- (6849, 6911),
- (6988, 6991),
- (7037, 7039),
+ (6863, 6911),
+ (6989, 6991),
+ (7039, 7039),
(7156, 7163),
(7224, 7226),
(7242, 7244),
@@ -2950,7 +3038,6 @@
(7355, 7356),
(7368, 7375),
(7419, 7423),
- (7674, 7674),
(7958, 7959),
(7966, 7967),
(8006, 8007),
@@ -2973,15 +3060,13 @@
(8306, 8307),
(8335, 8335),
(8349, 8351),
- (8384, 8399),
+ (8385, 8399),
(8433, 8447),
(8588, 8591),
(9255, 9279),
(9291, 9311),
(11124, 11125),
(11158, 11158),
- (11311, 11311),
- (11359, 11359),
(11508, 11512),
(11558, 11558),
(11560, 11564),
@@ -2997,7 +3082,7 @@
(11727, 11727),
(11735, 11735),
(11743, 11743),
- (11859, 11903),
+ (11870, 11903),
(11930, 11930),
(12020, 12031),
(12246, 12271),
@@ -3009,13 +3094,14 @@
(12687, 12687),
(12772, 12783),
(12831, 12831),
- (40957, 40959),
(42125, 42127),
(42183, 42191),
(42540, 42559),
(42744, 42751),
- (42944, 42945),
- (42955, 42996),
+ (42955, 42959),
+ (42962, 42962),
+ (42964, 42964),
+ (42970, 42993),
(43053, 43055),
(43066, 43071),
(43128, 43135),
@@ -3051,11 +3137,10 @@
(64319, 64319),
(64322, 64322),
(64325, 64325),
- (64450, 64466),
- (64832, 64847),
+ (64451, 64466),
(64912, 64913),
- (64968, 65007),
- (65022, 65023),
+ (64968, 64974),
+ (64976, 65007),
(65050, 65055),
(65107, 65107),
(65127, 65127),
@@ -3098,10 +3183,20 @@
(66812, 66815),
(66856, 66863),
(66916, 66926),
- (66928, 67071),
+ (66939, 66939),
+ (66955, 66955),
+ (66963, 66963),
+ (66966, 66966),
+ (66978, 66978),
+ (66994, 66994),
+ (67002, 67002),
+ (67005, 67071),
(67383, 67391),
(67414, 67423),
- (67432, 67583),
+ (67432, 67455),
+ (67462, 67462),
+ (67505, 67505),
+ (67515, 67583),
(67590, 67591),
(67593, 67593),
(67638, 67638),
@@ -3144,13 +3239,14 @@
(69294, 69295),
(69298, 69375),
(69416, 69423),
- (69466, 69551),
+ (69466, 69487),
+ (69514, 69551),
(69580, 69599),
(69623, 69631),
(69710, 69713),
- (69744, 69758),
+ (69750, 69758),
(69821, 69821),
- (69826, 69839),
+ (69827, 69839),
(69865, 69871),
(69882, 69887),
(69941, 69941),
@@ -3191,11 +3287,11 @@
(71237, 71247),
(71258, 71263),
(71277, 71295),
- (71353, 71359),
+ (71354, 71359),
(71370, 71423),
(71451, 71452),
(71468, 71471),
- (71488, 71679),
+ (71495, 71679),
(71740, 71839),
(71923, 71934),
(71943, 71944),
@@ -3210,7 +3306,7 @@
(72152, 72153),
(72165, 72191),
(72264, 72271),
- (72355, 72383),
+ (72355, 72367),
(72441, 72703),
(72713, 72713),
(72759, 72759),
@@ -3238,13 +3334,15 @@
(74650, 74751),
(74863, 74863),
(74869, 74879),
- (75076, 77823),
+ (75076, 77711),
+ (77811, 77823),
(78895, 82943),
(83527, 92159),
(92729, 92735),
(92767, 92767),
(92778, 92781),
- (92784, 92879),
+ (92863, 92863),
+ (92874, 92879),
(92910, 92911),
(92918, 92927),
(92998, 93007),
@@ -3260,8 +3358,11 @@
(94194, 94207),
(100344, 100351),
(101590, 101631),
- (101641, 110591),
- (110879, 110927),
+ (101641, 110575),
+ (110580, 110580),
+ (110588, 110588),
+ (110591, 110591),
+ (110883, 110927),
(110931, 110947),
(110952, 110959),
(111356, 113663),
@@ -3269,11 +3370,14 @@
(113789, 113791),
(113801, 113807),
(113818, 113819),
- (113824, 118783),
+ (113824, 118527),
+ (118574, 118575),
+ (118599, 118607),
+ (118724, 118783),
(119030, 119039),
(119079, 119080),
(119155, 119162),
- (119273, 119295),
+ (119275, 119295),
(119366, 119519),
(119540, 119551),
(119639, 119647),
@@ -3300,7 +3404,8 @@
(120780, 120781),
(121484, 121498),
(121504, 121504),
- (121520, 122879),
+ (121520, 122623),
+ (122655, 122879),
(122887, 122887),
(122905, 122906),
(122914, 122914),
@@ -3309,9 +3414,14 @@
(123181, 123183),
(123198, 123199),
(123210, 123213),
- (123216, 123583),
+ (123216, 123535),
+ (123567, 123583),
(123642, 123646),
- (123648, 124927),
+ (123648, 124895),
+ (124903, 124903),
+ (124908, 124908),
+ (124911, 124911),
+ (124927, 124927),
(125125, 125126),
(125143, 125183),
(125260, 125263),
@@ -3365,34 +3475,35 @@
(127561, 127567),
(127570, 127583),
(127590, 127743),
- (128728, 128735),
+ (128728, 128732),
(128749, 128751),
(128765, 128767),
(128884, 128895),
(128985, 128991),
- (129004, 129023),
+ (129004, 129007),
+ (129009, 129023),
(129036, 129039),
(129096, 129103),
(129114, 129119),
(129160, 129167),
(129198, 129199),
(129202, 129279),
- (129401, 129401),
- (129484, 129484),
(129620, 129631),
(129646, 129647),
(129653, 129655),
- (129659, 129663),
+ (129661, 129663),
(129671, 129679),
- (129705, 129711),
- (129719, 129727),
- (129731, 129743),
- (129751, 129791),
+ (129709, 129711),
+ (129723, 129727),
+ (129734, 129743),
+ (129754, 129759),
+ (129768, 129775),
+ (129783, 129791),
(129939, 129939),
(129995, 130031),
(130042, 131071),
- (173790, 173823),
- (177973, 177983),
+ (173792, 173823),
+ (177977, 177983),
(178206, 178207),
(183970, 183983),
(191457, 194559),
@@ -3425,8 +3536,9 @@
(2048, 2069),
(2112, 2136),
(2144, 2154),
- (2208, 2228),
- (2230, 2247),
+ (2160, 2183),
+ (2185, 2190),
+ (2208, 2248),
(2308, 2361),
(2365, 2365),
(2384, 2384),
@@ -3491,6 +3603,7 @@
(3114, 3129),
(3133, 3133),
(3160, 3162),
+ (3165, 3165),
(3168, 3169),
(3200, 3200),
(3205, 3212),
@@ -3499,7 +3612,7 @@
(3242, 3251),
(3253, 3257),
(3261, 3261),
- (3294, 3294),
+ (3293, 3294),
(3296, 3297),
(3313, 3314),
(3332, 3340),
@@ -3563,9 +3676,8 @@
(5761, 5786),
(5792, 5866),
(5873, 5880),
- (5888, 5900),
- (5902, 5905),
- (5920, 5937),
+ (5888, 5905),
+ (5919, 5937),
(5952, 5969),
(5984, 5996),
(5998, 6000),
@@ -3585,7 +3697,7 @@
(6656, 6678),
(6688, 6740),
(6917, 6963),
- (6981, 6987),
+ (6981, 6988),
(7043, 7072),
(7086, 7087),
(7098, 7141),
@@ -3618,8 +3730,7 @@
(12704, 12735),
(12784, 12799),
(13312, 19903),
- (19968, 40956),
- (40960, 40980),
+ (19968, 40980),
(40982, 42124),
(42192, 42231),
(42240, 42507),
@@ -3747,9 +3858,12 @@
(69376, 69404),
(69415, 69415),
(69424, 69445),
+ (69488, 69505),
(69552, 69572),
(69600, 69622),
(69635, 69687),
+ (69745, 69746),
+ (69749, 69749),
(69763, 69807),
(69840, 69864),
(69891, 69926),
@@ -3791,6 +3905,7 @@
(71296, 71338),
(71352, 71352),
(71424, 71450),
+ (71488, 71494),
(71680, 71723),
(71935, 71942),
(71945, 71945),
@@ -3809,7 +3924,7 @@
(72272, 72272),
(72284, 72329),
(72349, 72349),
- (72384, 72440),
+ (72368, 72440),
(72704, 72712),
(72714, 72750),
(72768, 72768),
@@ -3826,10 +3941,12 @@
(73648, 73648),
(73728, 74649),
(74880, 75075),
+ (77712, 77808),
(77824, 78894),
(82944, 83526),
(92160, 92728),
(92736, 92766),
+ (92784, 92862),
(92880, 92909),
(92928, 92975),
(93027, 93047),
@@ -3839,7 +3956,7 @@
(94208, 100343),
(100352, 101589),
(101632, 101640),
- (110592, 110878),
+ (110592, 110882),
(110928, 110930),
(110948, 110951),
(110960, 111355),
@@ -3847,9 +3964,15 @@
(113776, 113788),
(113792, 113800),
(113808, 113817),
+ (122634, 122634),
(123136, 123180),
(123214, 123214),
+ (123536, 123565),
(123584, 123627),
+ (124896, 124902),
+ (124904, 124907),
+ (124909, 124910),
+ (124912, 124926),
(124928, 125124),
(126464, 126467),
(126469, 126495),
@@ -3884,8 +4007,8 @@
(126625, 126627),
(126629, 126633),
(126635, 126651),
- (131072, 173789),
- (173824, 177972),
+ (131072, 173791),
+ (173824, 177976),
(177984, 178205),
(178208, 183969),
(183984, 191456),
@@ -3991,7 +4114,7 @@
(1545, 1546),
(1548, 1549),
(1563, 1563),
- (1566, 1567),
+ (1565, 1567),
(1642, 1645),
(1748, 1748),
(1792, 1805),
@@ -4028,6 +4151,7 @@
(6816, 6822),
(6824, 6829),
(7002, 7008),
+ (7037, 7038),
(7164, 7167),
(7227, 7231),
(7294, 7295),
@@ -4056,7 +4180,7 @@
(11836, 11839),
(11841, 11841),
(11843, 11855),
- (11858, 11858),
+ (11858, 11860),
(12289, 12291),
(12349, 12349),
(12539, 12539),
@@ -4110,6 +4234,7 @@
(68409, 68415),
(68505, 68508),
(69461, 69465),
+ (69510, 69513),
(69703, 69709),
(69819, 69820),
(69822, 69825),
@@ -4128,6 +4253,7 @@
(71105, 71127),
(71233, 71235),
(71264, 71276),
+ (71353, 71353),
(71484, 71486),
(71739, 71739),
(72004, 72006),
@@ -4140,6 +4266,7 @@
(73463, 73464),
(73727, 73727),
(74864, 74868),
+ (77809, 77810),
(92782, 92783),
(92917, 92917),
(92983, 92987),
@@ -4259,7 +4386,9 @@
(43062, 43063),
(43065, 43065),
(43639, 43641),
- (65021, 65021),
+ (64832, 64847),
+ (64975, 64975),
+ (65021, 65023),
(65508, 65508),
(65512, 65512),
(65517, 65518),
@@ -4278,13 +4407,14 @@
(92988, 92991),
(92997, 92997),
(113820, 113820),
+ (118608, 118723),
(118784, 119029),
(119040, 119078),
(119081, 119140),
(119146, 119148),
(119171, 119172),
(119180, 119209),
- (119214, 119272),
+ (119214, 119274),
(119296, 119361),
(119365, 119365),
(119552, 119638),
@@ -4310,28 +4440,29 @@
(127584, 127589),
(127744, 127994),
(128000, 128727),
- (128736, 128748),
+ (128733, 128748),
(128752, 128764),
(128768, 128883),
(128896, 128984),
(128992, 129003),
+ (129008, 129008),
(129024, 129035),
(129040, 129095),
(129104, 129113),
(129120, 129159),
(129168, 129197),
(129200, 129201),
- (129280, 129400),
- (129402, 129483),
- (129485, 129619),
+ (129280, 129619),
(129632, 129645),
(129648, 129652),
- (129656, 129658),
+ (129656, 129660),
(129664, 129670),
- (129680, 129704),
- (129712, 129718),
- (129728, 129730),
- (129744, 129750),
+ (129680, 129708),
+ (129712, 129722),
+ (129728, 129733),
+ (129744, 129753),
+ (129760, 129767),
+ (129776, 129782),
(129792, 129938),
(129940, 129994),
];
@@ -4369,7 +4500,7 @@
(1545, 1546),
(1548, 1549),
(1563, 1563),
- (1566, 1567),
+ (1565, 1567),
(1642, 1645),
(1748, 1748),
(1792, 1805),
@@ -4408,6 +4539,7 @@
(6816, 6822),
(6824, 6829),
(7002, 7008),
+ (7037, 7038),
(7164, 7167),
(7227, 7231),
(7294, 7295),
@@ -4432,7 +4564,7 @@
(11632, 11632),
(11776, 11822),
(11824, 11855),
- (11858, 11858),
+ (11858, 11869),
(12289, 12291),
(12296, 12305),
(12308, 12319),
@@ -4488,6 +4620,7 @@
(68505, 68508),
(69293, 69293),
(69461, 69465),
+ (69510, 69513),
(69703, 69709),
(69819, 69820),
(69822, 69825),
@@ -4506,6 +4639,7 @@
(71105, 71127),
(71233, 71235),
(71264, 71276),
+ (71353, 71353),
(71484, 71486),
(71739, 71739),
(72004, 72006),
@@ -4518,6 +4652,7 @@
(73463, 73464),
(73727, 73727),
(74864, 74868),
+ (77809, 77810),
(92782, 92783),
(92917, 92917),
(92983, 92987),
@@ -4608,6 +4743,8 @@
(4231, 4236),
(4239, 4239),
(4250, 4252),
+ (5909, 5909),
+ (5940, 5940),
(6070, 6070),
(6078, 6085),
(6087, 6088),
@@ -4764,6 +4901,7 @@
(1789, 1790),
(2038, 2038),
(2046, 2047),
+ (2184, 2184),
(2546, 2547),
(2554, 2555),
(2801, 2801),
@@ -4802,7 +4940,7 @@
(8274, 8274),
(8314, 8316),
(8330, 8332),
- (8352, 8383),
+ (8352, 8384),
(8448, 8449),
(8451, 8454),
(8456, 8457),
@@ -4864,8 +5002,10 @@
(43867, 43867),
(43882, 43883),
(64297, 64297),
- (64434, 64449),
- (65020, 65021),
+ (64434, 64450),
+ (64832, 64847),
+ (64975, 64975),
+ (65020, 65023),
(65122, 65122),
(65124, 65126),
(65129, 65129),
@@ -4892,13 +5032,14 @@
(92988, 92991),
(92997, 92997),
(113820, 113820),
+ (118608, 118723),
(118784, 119029),
(119040, 119078),
(119081, 119140),
(119146, 119148),
(119171, 119172),
(119180, 119209),
- (119214, 119272),
+ (119214, 119274),
(119296, 119361),
(119365, 119365),
(119552, 119638),
@@ -4936,28 +5077,29 @@
(127568, 127569),
(127584, 127589),
(127744, 128727),
- (128736, 128748),
+ (128733, 128748),
(128752, 128764),
(128768, 128883),
(128896, 128984),
(128992, 129003),
+ (129008, 129008),
(129024, 129035),
(129040, 129095),
(129104, 129113),
(129120, 129159),
(129168, 129197),
(129200, 129201),
- (129280, 129400),
- (129402, 129483),
- (129485, 129619),
+ (129280, 129619),
(129632, 129645),
(129648, 129652),
- (129656, 129658),
+ (129656, 129660),
(129664, 129670),
- (129680, 129704),
- (129712, 129718),
- (129728, 129730),
- (129744, 129750),
+ (129680, 129708),
+ (129712, 129722),
+ (129728, 129733),
+ (129744, 129753),
+ (129760, 129767),
+ (129776, 129782),
(129792, 129938),
(129940, 129994),
];
@@ -4988,7 +5130,6 @@
(1480, 1487),
(1515, 1518),
(1525, 1535),
- (1565, 1565),
(1806, 1806),
(1867, 1868),
(1970, 1983),
@@ -4997,9 +5138,9 @@
(2111, 2111),
(2140, 2141),
(2143, 2143),
- (2155, 2207),
- (2229, 2229),
- (2248, 2258),
+ (2155, 2159),
+ (2191, 2191),
+ (2194, 2199),
(2436, 2436),
(2445, 2446),
(2449, 2450),
@@ -5077,12 +5218,13 @@
(3085, 3085),
(3089, 3089),
(3113, 3113),
- (3130, 3132),
+ (3130, 3131),
(3141, 3141),
(3145, 3145),
(3150, 3156),
(3159, 3159),
- (3163, 3167),
+ (3163, 3164),
+ (3166, 3167),
(3172, 3173),
(3184, 3190),
(3213, 3213),
@@ -5093,7 +5235,7 @@
(3269, 3269),
(3273, 3273),
(3278, 3284),
- (3287, 3293),
+ (3287, 3292),
(3295, 3295),
(3300, 3301),
(3312, 3312),
@@ -5161,8 +5303,7 @@
(5118, 5119),
(5789, 5791),
(5881, 5887),
- (5901, 5901),
- (5909, 5919),
+ (5910, 5918),
(5943, 5951),
(5972, 5983),
(5997, 5997),
@@ -5171,7 +5312,6 @@
(6110, 6111),
(6122, 6127),
(6138, 6143),
- (6159, 6159),
(6170, 6175),
(6265, 6271),
(6315, 6319),
@@ -5191,9 +5331,9 @@
(6794, 6799),
(6810, 6815),
(6830, 6831),
- (6849, 6911),
- (6988, 6991),
- (7037, 7039),
+ (6863, 6911),
+ (6989, 6991),
+ (7039, 7039),
(7156, 7163),
(7224, 7226),
(7242, 7244),
@@ -5201,7 +5341,6 @@
(7355, 7356),
(7368, 7375),
(7419, 7423),
- (7674, 7674),
(7958, 7959),
(7966, 7967),
(8006, 8007),
@@ -5222,15 +5361,13 @@
(8306, 8307),
(8335, 8335),
(8349, 8351),
- (8384, 8399),
+ (8385, 8399),
(8433, 8447),
(8588, 8591),
(9255, 9279),
(9291, 9311),
(11124, 11125),
(11158, 11158),
- (11311, 11311),
- (11359, 11359),
(11508, 11512),
(11558, 11558),
(11560, 11564),
@@ -5246,7 +5383,7 @@
(11727, 11727),
(11735, 11735),
(11743, 11743),
- (11859, 11903),
+ (11870, 11903),
(11930, 11930),
(12020, 12031),
(12246, 12271),
@@ -5258,13 +5395,14 @@
(12687, 12687),
(12772, 12783),
(12831, 12831),
- (40957, 40959),
(42125, 42127),
(42183, 42191),
(42540, 42559),
(42744, 42751),
- (42944, 42945),
- (42955, 42996),
+ (42955, 42959),
+ (42962, 42962),
+ (42964, 42964),
+ (42970, 42993),
(43053, 43055),
(43066, 43071),
(43128, 43135),
@@ -5300,11 +5438,10 @@
(64319, 64319),
(64322, 64322),
(64325, 64325),
- (64450, 64466),
- (64832, 64847),
+ (64451, 64466),
(64912, 64913),
- (64968, 65007),
- (65022, 65023),
+ (64968, 64974),
+ (64976, 65007),
(65050, 65055),
(65107, 65107),
(65127, 65127),
@@ -5348,10 +5485,20 @@
(66812, 66815),
(66856, 66863),
(66916, 66926),
- (66928, 67071),
+ (66939, 66939),
+ (66955, 66955),
+ (66963, 66963),
+ (66966, 66966),
+ (66978, 66978),
+ (66994, 66994),
+ (67002, 67002),
+ (67005, 67071),
(67383, 67391),
(67414, 67423),
- (67432, 67583),
+ (67432, 67455),
+ (67462, 67462),
+ (67505, 67505),
+ (67515, 67583),
(67590, 67591),
(67593, 67593),
(67638, 67638),
@@ -5394,12 +5541,13 @@
(69294, 69295),
(69298, 69375),
(69416, 69423),
- (69466, 69551),
+ (69466, 69487),
+ (69514, 69551),
(69580, 69599),
(69623, 69631),
(69710, 69713),
- (69744, 69758),
- (69826, 69836),
+ (69750, 69758),
+ (69827, 69836),
(69838, 69839),
(69865, 69871),
(69882, 69887),
@@ -5441,11 +5589,11 @@
(71237, 71247),
(71258, 71263),
(71277, 71295),
- (71353, 71359),
+ (71354, 71359),
(71370, 71423),
(71451, 71452),
(71468, 71471),
- (71488, 71679),
+ (71495, 71679),
(71740, 71839),
(71923, 71934),
(71943, 71944),
@@ -5460,7 +5608,7 @@
(72152, 72153),
(72165, 72191),
(72264, 72271),
- (72355, 72383),
+ (72355, 72367),
(72441, 72703),
(72713, 72713),
(72759, 72759),
@@ -5488,14 +5636,16 @@
(74650, 74751),
(74863, 74863),
(74869, 74879),
- (75076, 77823),
+ (75076, 77711),
+ (77811, 77823),
(78895, 78895),
(78905, 82943),
(83527, 92159),
(92729, 92735),
(92767, 92767),
(92778, 92781),
- (92784, 92879),
+ (92863, 92863),
+ (92874, 92879),
(92910, 92911),
(92918, 92927),
(92998, 93007),
@@ -5511,8 +5661,11 @@
(94194, 94207),
(100344, 100351),
(101590, 101631),
- (101641, 110591),
- (110879, 110927),
+ (101641, 110575),
+ (110580, 110580),
+ (110588, 110588),
+ (110591, 110591),
+ (110883, 110927),
(110931, 110947),
(110952, 110959),
(111356, 113663),
@@ -5520,10 +5673,13 @@
(113789, 113791),
(113801, 113807),
(113818, 113819),
- (113828, 118783),
+ (113828, 118527),
+ (118574, 118575),
+ (118599, 118607),
+ (118724, 118783),
(119030, 119039),
(119079, 119080),
- (119273, 119295),
+ (119275, 119295),
(119366, 119519),
(119540, 119551),
(119639, 119647),
@@ -5550,7 +5706,8 @@
(120780, 120781),
(121484, 121498),
(121504, 121504),
- (121520, 122879),
+ (121520, 122623),
+ (122655, 122879),
(122887, 122887),
(122905, 122906),
(122914, 122914),
@@ -5559,9 +5716,14 @@
(123181, 123183),
(123198, 123199),
(123210, 123213),
- (123216, 123583),
+ (123216, 123535),
+ (123567, 123583),
(123642, 123646),
- (123648, 124927),
+ (123648, 124895),
+ (124903, 124903),
+ (124908, 124908),
+ (124911, 124911),
+ (124927, 124927),
(125125, 125126),
(125143, 125183),
(125260, 125263),
@@ -5615,34 +5777,35 @@
(127561, 127567),
(127570, 127583),
(127590, 127743),
- (128728, 128735),
+ (128728, 128732),
(128749, 128751),
(128765, 128767),
(128884, 128895),
(128985, 128991),
- (129004, 129023),
+ (129004, 129007),
+ (129009, 129023),
(129036, 129039),
(129096, 129103),
(129114, 129119),
(129160, 129167),
(129198, 129199),
(129202, 129279),
- (129401, 129401),
- (129484, 129484),
(129620, 129631),
(129646, 129647),
(129653, 129655),
- (129659, 129663),
+ (129661, 129663),
(129671, 129679),
- (129705, 129711),
- (129719, 129727),
- (129731, 129743),
- (129751, 129791),
+ (129709, 129711),
+ (129723, 129727),
+ (129734, 129743),
+ (129754, 129759),
+ (129768, 129775),
+ (129783, 129791),
(129939, 129939),
(129995, 130031),
(130042, 131071),
- (173790, 173823),
- (177973, 177983),
+ (173792, 173823),
+ (177977, 177983),
(178206, 178207),
(183970, 183983),
(191457, 194559),
@@ -6087,7 +6250,7 @@
(8510, 8511),
(8517, 8517),
(8579, 8579),
- (11264, 11310),
+ (11264, 11311),
(11360, 11360),
(11362, 11364),
(11367, 11367),
@@ -6252,13 +6415,21 @@
(42938, 42938),
(42940, 42940),
(42942, 42942),
+ (42944, 42944),
(42946, 42946),
(42948, 42951),
(42953, 42953),
+ (42960, 42960),
+ (42966, 42966),
+ (42968, 42968),
(42997, 42997),
(65313, 65338),
(66560, 66599),
(66736, 66771),
+ (66928, 66938),
+ (66940, 66954),
+ (66956, 66962),
+ (66964, 66965),
(68736, 68786),
(71840, 71871),
(93760, 93791),
diff --git a/src/lib.rs b/src/lib.rs
index 2c921d5..afe0e80 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@
properties defined by Unicode that correspond to sets of Unicode codepoints.
(These properties are formally called boolean properties or "single valued"
properties. See
-[UTR#23 S3.3](http://www.unicode.org/reports/tr23/#PropertyTypeDefinitions)
+[UTR#23 S3.3](https://www.unicode.org/reports/tr23/#PropertyTypeDefinitions)
for more details.)
This crate has two principle types: `TrieSetOwned` and `TrieSetSlice`,