Merge pull request #103 from Marcondiro/master

Manishearth · web-flow · commit c9921309f09e · 2024-09-17T08:26:45.000-07:00
Update Unicode to version 16.0.0, bump to 0.1.24
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -67,10 +67,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install msrv toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: 1.36
-          override: true
+      uses: dtolnay/rust-toolchain@1.36.0
+    - name: Use tinyvec 1.6.0
+      run: cargo update -p tinyvec --precise 1.6.0
     - name: Build
       run: cargo build --verbose --all-features
   regen:
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 authors = [
     "kwantam <kwantam@gmail.com>",
     "Manish Goregaokar <manishsmail@gmail.com>",
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -22,7 +22,7 @@
 import urllib.request
 from itertools import batched
 
-UNICODE_VERSION = "15.1.0"
+UNICODE_VERSION = "16.0.0"
 UCD_URL = "https://www.unicode.org/Public/%s/ucd/" % UNICODE_VERSION
 
 PREAMBLE = """// Copyright 2012-2018 The Rust Project Developers. See the COPYRIGHT
@@ -388,7 +388,7 @@ def gen_composition_table(canon_comp, out):
     out.write("pub(crate) fn composition_table_astral(c1: char, c2: char) -> Option<char> {\n")
     out.write("    match (c1, c2) {\n")
     for (c1, c2), c3 in sorted(canon_comp.items()):
-        if c1 >= 0x10000 and c2 >= 0x10000:
+        if c1 >= 0x10000 or c2 >= 0x10000:
             out.write("        ('\\u{%s}', '\\u{%s}') => Some('\\u{%s}'),\n" % (hexify(c1), hexify(c2), hexify(c3)))
 
     out.write("        _ => None,\n")
diff --git a/src/quick_check.rs b/src/quick_check.rs
@@ -3,6 +3,9 @@ use crate::stream_safe;
 use crate::tables;
 use crate::UnicodeNormalization;
 
+/// QuickCheck quickly determines if a string is normalized, it can return
+/// `Maybe`
+///
 /// The QuickCheck algorithm can quickly determine if a text is or isn't
 /// normalized without any allocations in many cases, but it has to be able to
 /// return `Maybe` when a full decomposition and recomposition is necessary.
diff --git a/src/tables.rs b/src/tables.rs
diff --git a/tests/data/normalization_tests.rs b/tests/data/normalization_tests.rs
