Skip to content

Commit

Permalink
Update ICU4X
Browse files Browse the repository at this point in the history
This updates all ICU4X crates and regenerates rustc_baked_icu_data.

Since the new unicode license under which they are licensed does not
have an SPDX identifier yet, we define some exceptions. The license has
to be reviewed to make sure it is still fine to use here, but I assume
that is the case.

I also added an exception for rustc_icu_data to the unexplained ignore
doctest tidy lint. This is a bit hacky but the whole style.rs in tidy is
a mess so I didn't want to touch it more than this small hack.
  • Loading branch information
Noratrieb committed Nov 6, 2023
1 parent 6bf2fb3 commit ffffc20
Show file tree
Hide file tree
Showing 31 changed files with 286 additions and 898 deletions.
74 changes: 52 additions & 22 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1890,21 +1890,29 @@ dependencies = [

[[package]]
name = "icu_list"
version = "1.2.0"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd7ba7442d9235b689d4fdce17c452ea229934980fd81ba50cc28275752c9f90"
checksum = "dc1a44bbed77a7e7b555f9d7dd4b43f75ec1402b438a901d20451943d50cbd90"
dependencies = [
"displaydoc",
"icu_list_data",
"icu_locid_transform",
"icu_provider",
"regex-automata 0.2.0",
"writeable",
]

[[package]]
name = "icu_list_data"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3237583f0cb7feafabb567c4492fe9ef1d2d4113f6a8798a923273ea5de996d"

[[package]]
name = "icu_locid"
version = "1.2.0"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c"
dependencies = [
"displaydoc",
"litemap",
Expand All @@ -1913,16 +1921,37 @@ dependencies = [
"zerovec",
]

[[package]]
name = "icu_locid_transform"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7"
dependencies = [
"displaydoc",
"icu_locid",
"icu_locid_transform_data",
"icu_provider",
"tinystr",
"zerovec",
]

[[package]]
name = "icu_locid_transform_data"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44"

[[package]]
name = "icu_provider"
version = "1.2.0"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934"
dependencies = [
"displaydoc",
"icu_locid",
"icu_provider_macros",
"stable_deref_trait",
"tinystr",
"writeable",
"yoke",
"zerofrom",
Expand All @@ -1931,26 +1960,26 @@ dependencies = [

[[package]]
name = "icu_provider_adapters"
version = "1.2.0"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d"
dependencies = [
"icu_locid",
"icu_locid_transform",
"icu_provider",
"tinystr",
"yoke",
"zerovec",
]

[[package]]
name = "icu_provider_macros"
version = "1.2.0"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.29",
]

[[package]]
Expand Down Expand Up @@ -2310,9 +2339,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"

[[package]]
name = "litemap"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"
checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1"

[[package]]
name = "lld-wrapper"
Expand Down Expand Up @@ -3558,6 +3587,7 @@ version = "0.0.0"
dependencies = [
"icu_list",
"icu_locid",
"icu_locid_transform",
"icu_provider",
"icu_provider_adapters",
"zerovec",
Expand Down Expand Up @@ -5498,9 +5528,9 @@ dependencies = [

[[package]]
name = "tinystr"
version = "0.7.1"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
dependencies = [
"displaydoc",
"zerovec",
Expand Down Expand Up @@ -6296,9 +6326,9 @@ dependencies = [

[[package]]
name = "writeable"
version = "0.5.2"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f"
checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2"

[[package]]
name = "xattr"
Expand Down Expand Up @@ -6358,9 +6388,9 @@ dependencies = [

[[package]]
name = "yoke"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4"
dependencies = [
"serde",
"stable_deref_trait",
Expand Down Expand Up @@ -6403,9 +6433,9 @@ dependencies = [

[[package]]
name = "zerovec"
version = "0.9.4"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"
checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e"
dependencies = [
"yoke",
"zerofrom",
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_baked_icu_data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ edition = "2021"
# tidy-alphabetical-start
icu_list = "1.2"
icu_locid = "1.2"
icu_locid_transform = "1.3.2"
icu_provider = "1.2"
icu_provider_adapters = "1.2"
zerovec = "0.9.4"
zerovec = "0.10.0"
# tidy-alphabetical-end

[features]
Expand Down

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions compiler/rustc_baked_icu_data/src/data/fallback/mod.rs

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

50 changes: 0 additions & 50 deletions compiler/rustc_baked_icu_data/src/data/list/and_v1/en.rs.data

This file was deleted.

Loading

0 comments on commit ffffc20

Please sign in to comment.