Skip to content

Commit 984c61e

Browse files
authored
Merge pull request #2087 from nnethercote/update-unicode-normalization
Add `unicode-normalization-0.1.24`
2 parents 172ce68 + 894f7ff commit 984c61e

29 files changed

+25653
-0
lines changed

collector/compile-benchmarks/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ They mostly consist of real-world crates.
5959
- **unicode-normalization-0.1.19**: Unicode character composition and decomposition
6060
utilities. Uses huge `match` statements that stress the compiler in unusual
6161
ways.
62+
- **unicode-normalization-0.1.24**: Unicode character composition and decomposition
63+
utilities. Uses huge `match` statements that stress the compiler in unusual
64+
ways.
6265

6366
## Secondary
6467

collector/compile-benchmarks/REUSE.toml

+5
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,11 @@ path = "unicode-normalization-0.1.19/**"
289289
SPDX-FileCopyrightText = "unicode-normalization contributors"
290290
SPDX-License-Identifier = "MIT OR Apache-2.0"
291291

292+
[[annotations]]
293+
path = "unicode-normalization-0.1.24/**"
294+
SPDX-FileCopyrightText = "unicode-normalization contributors"
295+
SPDX-License-Identifier = "MIT OR Apache-2.0"
296+
292297
[[annotations]]
293298
path = "unify-linearly/**"
294299
SPDX-FileCopyrightText = "The Rust Project Developers (see https://thanks.rust-lang.org)"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"git": {
3+
"sha1": "c9921309f09ebd05108920fda92efbf5f8124a7d"
4+
},
5+
"path_in_vcs": ""
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: Rust
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
env:
10+
CARGO_INCREMENTAL: 0
11+
CARGO_TERM_COLOR: always
12+
RUST_BACKTRACE: 1
13+
RUSTFLAGS: -D warnings
14+
RUSTDOCFLAGS: -D warnings --cfg docsrs
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
strategy:
20+
matrix:
21+
rust:
22+
- stable
23+
- beta
24+
- nightly
25+
steps:
26+
- uses: actions/checkout@v2
27+
- name: Install toolchain
28+
uses: actions-rs/toolchain@v1
29+
with:
30+
toolchain: ${{ matrix.rust }}
31+
override: true
32+
components: rustfmt, clippy
33+
- name: Build
34+
run: cargo build --verbose
35+
- name: Run tests with all features
36+
run: cargo test --all-features --verbose
37+
- name: Run tests without features
38+
run: cargo test --no-default-features --verbose
39+
- name: Package
40+
run: cargo package
41+
- name: Test package
42+
run: cd $(find target/package/ -maxdepth 1 -mindepth 1 -type d) && cargo test
43+
- name: Test package without features
44+
run: cd $(find target/package/ -maxdepth 1 -mindepth 1 -type d) && cargo test --no-default-features
45+
- name: Build docs
46+
if: matrix.rust == 'nightly'
47+
run: cargo doc --all-features --verbose
48+
- name: Check formatting
49+
if: matrix.rust == 'stable'
50+
run: cargo fmt --all --check
51+
- name: Check clippy
52+
if: matrix.rust == 'stable'
53+
run: cargo clippy --all-features --lib --tests --examples --verbose
54+
- name: Check benchmarks with clippy
55+
if: matrix.rust == 'nightly'
56+
run: cargo clippy --all-features --benches --verbose
57+
- name: Check fuzz tests with clippy
58+
if: matrix.rust == 'stable'
59+
working-directory: fuzz
60+
run: cargo clippy --all-features --all-targets --verbose
61+
- name: Check fuzz tests formatting
62+
if: matrix.rust == 'stable'
63+
working-directory: fuzz
64+
run: cargo fmt --all --check
65+
msrv:
66+
runs-on: ubuntu-latest
67+
steps:
68+
- uses: actions/checkout@v2
69+
- name: Install msrv toolchain
70+
uses: dtolnay/[email protected]
71+
- name: Use tinyvec 1.6.0
72+
run: cargo update -p tinyvec --precise 1.6.0
73+
- name: Build
74+
run: cargo build --verbose --all-features
75+
regen:
76+
runs-on: ubuntu-latest
77+
steps:
78+
- uses: actions/checkout@v3
79+
- uses: actions/setup-python@v5
80+
with:
81+
python-version: '3.12'
82+
- name: Regen
83+
run: cd scripts && python3 unicode.py
84+
- name: Diff tables
85+
run: diff src/tables.rs scripts/tables.rs
86+
- name: Diff tests
87+
run: diff tests/data/normalization_tests.rs scripts/normalization_tests.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
target
2+
#Cargo.lock
3+
scripts/tmp
4+
*.pyc
5+
*.txt
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
language: rust
2+
rust:
3+
- 1.36.0
4+
- stable
5+
- nightly
6+
sudo: false
7+
script:
8+
- cargo build --verbose
9+
- cargo test --verbose
10+
- cargo test --verbose --no-default-features
11+
- cargo package
12+
- cd target/package/unicode-normalization-*
13+
- cargo test --verbose
14+
- cargo test --verbose --no-default-features
15+
notifications:
16+
email:
17+
on_success: never
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/lookups.rs b/src/lookups.rs
2+
index ea7a96c4..c1938cd1 100644
3+
--- a/src/lookups.rs
4+
+++ b/src/lookups.rs
5+
@@ -43,6 +43,7 @@ pub(crate) fn composition_table(c1: char, c2: char) -> Option<char> {
6+
}
7+
8+
pub(crate) fn canonical_fully_decomposed(c: char) -> Option<&'static [char]> {
9+
+ println!("testing");
10+
mph_lookup(
11+
c.into(),
12+
CANONICAL_DECOMPOSED_SALT,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Licensed under the Apache License, Version 2.0
2+
<LICENSE-APACHE or
3+
http://www.apache.org/licenses/LICENSE-2.0> or the MIT
4+
license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
5+
at your option. All files in the project carrying such
6+
notice may not be copied, modified, or distributed except
7+
according to those terms.

collector/compile-benchmarks/unicode-normalization-0.1.24/Cargo.lock

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
2+
#
3+
# When uploading crates to the registry Cargo will automatically
4+
# "normalize" Cargo.toml files for maximal compatibility
5+
# with all versions of Cargo and also rewrite `path` dependencies
6+
# to registry (e.g., crates.io) dependencies.
7+
#
8+
# If you are reading this file be aware that the original Cargo.toml
9+
# will likely look very different (and much more reasonable).
10+
# See Cargo.toml.orig for the original contents.
11+
12+
[package]
13+
edition = "2018"
14+
rust-version = "1.36"
15+
name = "unicode-normalization"
16+
version = "0.1.24"
17+
authors = [
18+
"kwantam <[email protected]>",
19+
"Manish Goregaokar <[email protected]>",
20+
]
21+
build = false
22+
exclude = [
23+
"target/*",
24+
"Cargo.lock",
25+
"scripts/tmp",
26+
"*.txt",
27+
"tests/*",
28+
]
29+
autobins = false
30+
autoexamples = false
31+
autotests = false
32+
autobenches = false
33+
description = """
34+
This crate provides functions for normalization of
35+
Unicode strings, including Canonical and Compatible
36+
Decomposition and Recomposition, as described in
37+
Unicode Standard Annex #15.
38+
"""
39+
homepage = "https://github.com/unicode-rs/unicode-normalization"
40+
documentation = "https://docs.rs/unicode-normalization/"
41+
readme = "README.md"
42+
keywords = [
43+
"text",
44+
"unicode",
45+
"normalization",
46+
"decomposition",
47+
"recomposition",
48+
]
49+
license = "MIT/Apache-2.0"
50+
repository = "https://github.com/unicode-rs/unicode-normalization"
51+
52+
[lib]
53+
name = "unicode_normalization"
54+
path = "src/lib.rs"
55+
56+
[[bench]]
57+
name = "bench"
58+
path = "benches/bench.rs"
59+
60+
[dependencies.tinyvec]
61+
version = "1"
62+
features = ["alloc"]
63+
64+
[features]
65+
default = ["std"]
66+
std = []
67+
68+
[workspace]

collector/compile-benchmarks/unicode-normalization-0.1.24/Cargo.toml.orig

+43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)