From 6bd4893cc44c2ca2718de47a119a31cc40045fe5 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 23 Nov 2024 01:45:32 +0000 Subject: [PATCH] Bump all ICU4X crates to 2.0.0-beta1 (#5862) --- Cargo.lock | 951 +++++++++++------- Cargo.toml | 84 +- .../bindings/demo_gen/AnyCalendarKind.mjs | 5 +- ffi/capi/bindings/demo_gen/CaseMapper.mjs | 39 +- .../bindings/demo_gen/ComposingNormalizer.mjs | 5 +- ffi/capi/bindings/demo_gen/Date.mjs | 22 +- ffi/capi/bindings/demo_gen/DateFormatter.d.ts | 4 +- ffi/capi/bindings/demo_gen/DateFormatter.mjs | 72 +- ffi/capi/bindings/demo_gen/DateTime.mjs | 38 +- .../bindings/demo_gen/DateTimeFormatter.d.ts | 2 +- .../bindings/demo_gen/DateTimeFormatter.mjs | 44 +- .../demo_gen/DecomposingNormalizer.mjs | 5 +- ffi/capi/bindings/demo_gen/FixedDecimal.mjs | 7 +- .../demo_gen/FixedDecimalFormatter.mjs | 11 +- .../demo_gen/GregorianDateFormatter.mjs | 34 +- .../demo_gen/GregorianDateTimeFormatter.mjs | 21 +- .../GregorianZonedDateTimeFormatter.mjs | 27 +- ffi/capi/bindings/demo_gen/ListFormatter.mjs | 9 +- ffi/capi/bindings/demo_gen/Locale.mjs | 37 +- ffi/capi/bindings/demo_gen/TimeFormatter.d.ts | 2 +- ffi/capi/bindings/demo_gen/TimeFormatter.mjs | 59 +- .../bindings/demo_gen/TimeZoneIdMapper.mjs | 20 +- ...meZoneIdMapperWithFastCanonicalization.mjs | 10 +- ffi/capi/bindings/demo_gen/TimeZoneInfo.mjs | 9 +- .../bindings/demo_gen/TitlecaseMapper.mjs | 15 +- .../demo_gen/ZonedDateTimeFormatter.d.ts | 2 +- .../demo_gen/ZonedDateTimeFormatter.mjs | 56 +- ffi/capi/bindings/demo_gen/index.mjs | 52 +- .../bindings/js/CanonicalDecomposition.mjs | 2 +- .../bindings/js/CodePointRangeIterator.mjs | 2 +- .../js/CodePointRangeIteratorResult.mjs | 42 +- ffi/capi/bindings/js/Collator.mjs | 2 +- ffi/capi/bindings/js/CollatorOptions.d.ts | 12 +- ffi/capi/bindings/js/CollatorOptions.mjs | 78 +- .../bindings/js/CollatorResolvedOptions.mjs | 74 +- ffi/capi/bindings/js/Date.mjs | 2 +- ffi/capi/bindings/js/DateTime.mjs | 2 +- ffi/capi/bindings/js/Decomposed.mjs | 34 +- ffi/capi/bindings/js/DisplayNamesOptions.d.ts | 8 +- ffi/capi/bindings/js/DisplayNamesOptions.mjs | 42 +- ffi/capi/bindings/js/FixedDecimal.mjs | 6 +- .../bindings/js/FixedDecimalLimitError.d.ts | 5 +- .../bindings/js/FixedDecimalLimitError.mjs | 7 +- ffi/capi/bindings/js/IsoDate.mjs | 2 +- ffi/capi/bindings/js/IsoDateTime.mjs | 2 +- ffi/capi/bindings/js/LineBreakOptions.d.ts | 7 +- ffi/capi/bindings/js/LineBreakOptions.mjs | 33 +- .../bindings/js/LocaleFallbackConfig.d.ts | 6 +- ffi/capi/bindings/js/LocaleFallbackConfig.mjs | 24 +- ffi/capi/bindings/js/PluralCategories.mjs | 66 +- ffi/capi/bindings/js/PluralRules.mjs | 2 +- ffi/capi/bindings/js/ReorderedIndexMap.mjs | 2 +- ffi/capi/bindings/js/TimeZoneInfo.mjs | 4 +- .../js/TimeZoneInvalidOffsetError.d.ts | 5 +- .../js/TimeZoneInvalidOffsetError.mjs | 7 +- ffi/capi/bindings/js/TitlecaseOptions.d.ts | 7 +- ffi/capi/bindings/js/TitlecaseOptions.mjs | 35 +- ffi/capi/bindings/js/WeekCalculator.mjs | 2 +- ffi/capi/bindings/js/WeekOf.mjs | 34 +- ffi/capi/bindings/js/WeekendContainsDay.d.ts | 12 +- ffi/capi/bindings/js/WeekendContainsDay.mjs | 78 +- ffi/capi/bindings/js/diplomat-runtime.mjs | 2 +- tutorials/c-tiny/fixeddecimal/Cargo.lock | 195 ++-- tutorials/c-tiny/fixeddecimal/Cargo.toml | 2 +- tutorials/c-tiny/segmenter/Cargo.lock | 195 ++-- tutorials/c-tiny/segmenter/Cargo.toml | 2 +- tutorials/c/Cargo.lock | 226 ++--- tutorials/c/Cargo.toml | 2 +- tutorials/cpp.md | 6 +- tutorials/cpp/Cargo.lock | 222 ++-- tutorials/cpp/Cargo.toml | 4 +- tutorials/gn/Cargo.toml | 6 +- tutorials/js-tiny/Cargo.lock | 244 ++--- tutorials/js-tiny/Cargo.toml | 2 +- tutorials/rust.md | 22 +- tutorials/rust/baked/Cargo.lock | 797 ++++++++++----- tutorials/rust/baked/Cargo.toml | 12 +- tutorials/rust/buffer/Cargo.lock | 180 ++-- tutorials/rust/buffer/Cargo.toml | 4 +- tutorials/rust/custom_compiled/Cargo.lock | 203 ++-- tutorials/rust/custom_compiled/Cargo.toml | 2 +- tutorials/rust/default/Cargo.lock | 203 ++-- tutorials/rust/default/Cargo.toml | 2 +- tutorials/rust/experimental/Cargo.lock | 203 ++-- tutorials/rust/experimental/Cargo.toml | 2 +- tutorials/rust/harfbuzz/Cargo.lock | 215 ++-- tutorials/rust/sync/Cargo.lock | 203 ++-- tutorials/rust/sync/Cargo.toml | 2 +- 88 files changed, 3189 insertions(+), 2257 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bab24e821fb..9c25ecbdf16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -51,51 +45,50 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.15" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -139,7 +132,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -168,23 +161,23 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -193,7 +186,7 @@ version = "0.0.0" dependencies = [ "crlify", "icu", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_export", "icu_provider_source", "log", @@ -234,7 +227,7 @@ dependencies = [ "rand_distr", "rand_pcg", "strum", - "writeable", + "writeable 0.6.0", ] [[package]] @@ -272,9 +265,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" [[package]] name = "bytecheck" @@ -306,9 +299,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "calendrical_calculations" @@ -327,9 +320,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.13" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -369,19 +362,20 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", + "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ "anstream", "anstyle", @@ -391,21 +385,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cobs" @@ -415,9 +409,9 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -562,7 +556,7 @@ dependencies = [ "databake", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", "synstructure", ] @@ -612,13 +606,14 @@ dependencies = [ [[package]] name = "diplomat" -version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef0c3a613b09df83bdd42393cd532830a795053102f87461fca1726999829c60" dependencies = [ "diplomat_core", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -642,16 +637,18 @@ dependencies = [ [[package]] name = "diplomat-runtime" -version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1708f176e12755d6d6571ad9b0ebbd3b428223b5cdf63a38eecf1479c13e70" dependencies = [ "log", ] [[package]] name = "diplomat-tool" -version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398313c0138ba1cd8ffc514f16b356ed17ed924c4efcfe3bc726ed631f6642bf" dependencies = [ "askama", "clap", @@ -663,15 +660,16 @@ dependencies = [ "pulldown-cmark", "quote", "serde", - "syn 2.0.75", + "syn 2.0.89", "syn-inline-mod", "toml", ] [[package]] name = "diplomat_core" -version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e5ba87fee6b8b9dcc575cfbc84ae97b8b9f891fa27f670996a4684e20bd178" dependencies = [ "displaydoc", "either", @@ -680,7 +678,7 @@ dependencies = [ "serde", "smallvec", "strck", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -691,18 +689,18 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] name = "dlmalloc" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264b043b8e977326c1ee9e723da2c1f8d09a99df52cacf00b4dbce5ac54414d" +checksum = "d9b5e0d321d61de16390ed273b647ce51605b575916d3c25e6ddf27a1e140035" dependencies = [ "cfg-if", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -719,7 +717,7 @@ dependencies = [ "crlify", "eyre", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_source", "log", "simple_logger", @@ -812,17 +810,17 @@ dependencies = [ "rand_pcg", "ryu", "smallvec", - "writeable", + "writeable 0.6.0", ] [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -870,9 +868,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "half" @@ -943,39 +941,39 @@ checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678" [[package]] name = "icu" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", "icu_collator", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_datetime", "icu_decimal", "icu_experimental", "icu_list", "icu_locale", - "icu_normalizer", + "icu_normalizer 2.0.0-beta1", "icu_pattern", "icu_plurals", - "icu_properties", - "icu_provider", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_blob", "icu_provider_registry", "icu_segmenter", "icu_timezone", "memchr", - "writeable", + "writeable 0.6.0", ] [[package]] name = "icu4x-datagen" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "clap", "eyre", "icu", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_blob", "icu_provider_export", "icu_provider_registry", @@ -991,8 +989,8 @@ dependencies = [ "ecma402_traits", "fixed_decimal", "icu", - "icu_provider", - "writeable", + "icu_provider 2.0.0-beta1", + "writeable 0.6.0", ] [[package]] @@ -1018,7 +1016,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "criterion", @@ -1028,19 +1026,19 @@ dependencies = [ "icu_benchmark_macros", "icu_calendar_data", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "ixdtf", "serde", "serde_json", "simple_logger", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_calendar_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1048,7 +1046,7 @@ dependencies = [ [[package]] name = "icu_capi" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "diplomat", "diplomat-runtime", @@ -1056,17 +1054,17 @@ dependencies = [ "icu_calendar", "icu_casemap", "icu_collator", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_datetime", "icu_decimal", "icu_experimental", "icu_list", "icu_locale", "icu_locale_core", - "icu_normalizer", + "icu_normalizer 2.0.0-beta1", "icu_plurals", - "icu_properties", - "icu_provider", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_blob", "icu_provider_fs", @@ -1077,15 +1075,15 @@ dependencies = [ "potential_utf", "serde", "simple_logger", - "tinystr", + "tinystr 0.8.0", "unicode-bidi", - "writeable", - "zerovec", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_casemap" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", @@ -1093,20 +1091,20 @@ dependencies = [ "icu", "icu_benchmark_macros", "icu_casemap_data", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", - "icu_normalizer", - "icu_properties", - "icu_provider", + "icu_normalizer 2.0.0-beta1", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "potential_utf", "serde", - "writeable", - "zerovec", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_casemap_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] @@ -1116,15 +1114,15 @@ name = "icu_codepointtrie_builder" version = "0.4.0-dev" dependencies = [ "icu", - "icu_collections", + "icu_collections 2.0.0-beta1", "wasmi", "wat", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_collator" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "arraystring", "atoi", @@ -1133,23 +1131,23 @@ dependencies = [ "displaydoc", "icu", "icu_collator_data", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", - "icu_normalizer", - "icu_normalizer_data", - "icu_properties", - "icu_provider", + "icu_normalizer 2.0.0-beta1", + "icu_normalizer_data 2.0.0-beta1", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "serde", "smallvec", "utf16_iter", "utf8_iter", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_collator_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1157,7 +1155,19 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0-dev" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke 0.7.4", + "zerofrom 0.1.4", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_collections" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", @@ -1165,20 +1175,20 @@ dependencies = [ "iai", "icu", "icu_benchmark_macros", - "icu_properties", + "icu_properties 2.0.0-beta1", "postcard", "potential_utf", "serde", "serde_json", "toml", - "yoke", - "zerofrom", - "zerovec", + "yoke 0.7.5", + "zerofrom 0.1.5", + "zerovec 0.11.0", ] [[package]] name = "icu_datetime" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "bincode", "criterion", @@ -1194,23 +1204,23 @@ dependencies = [ "icu_locale_core", "icu_pattern", "icu_plurals", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_blob", "icu_timezone", - "litemap", + "litemap 0.7.4", "potential_utf", "serde", "serde_json", "smallvec", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_datetime_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1218,7 +1228,7 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", @@ -1229,20 +1239,20 @@ dependencies = [ "icu_benchmark_macros", "icu_decimal_data", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "rand", "rand_distr", "rand_pcg", "serde", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_decimal_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1258,21 +1268,21 @@ dependencies = [ "either", "fixed_decimal", "icu", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_decimal", "icu_experimental_data", "icu_list", "icu_locale", "icu_locale_core", "icu_locale_data", - "icu_normalizer", - "icu_normalizer_data", + "icu_normalizer 2.0.0-beta1", + "icu_normalizer_data 2.0.0-beta1", "icu_pattern", "icu_plurals", - "icu_properties", - "icu_properties_data", - "icu_provider", - "litemap", + "icu_properties 2.0.0-beta1", + "icu_properties_data 2.0.0-beta1", + "icu_provider 2.0.0-beta1", + "litemap 0.7.4", "log", "num-bigint", "num-rational", @@ -1280,11 +1290,11 @@ dependencies = [ "potential_utf", "serde", "smallvec", - "tinystr", - "writeable", - "zerofrom", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerofrom 0.1.5", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] @@ -1297,12 +1307,12 @@ dependencies = [ [[package]] name = "icu_freertos" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "cortex-m", "freertos-rust", "icu_capi", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1311,32 +1321,32 @@ version = "0.2.0" dependencies = [ "displaydoc", "harfbuzz-traits", - "icu_normalizer", - "icu_properties", - "icu_provider", + "icu_normalizer 2.0.0-beta1", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", ] [[package]] name = "icu_list" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "icu", "icu_benchmark_macros", "icu_list_data", - "icu_provider", + "icu_provider 2.0.0-beta1", "postcard", "regex-automata", "rmp-serde", "serde", "serde_json", - "writeable", + "writeable 0.6.0", ] [[package]] name = "icu_list_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1344,27 +1354,27 @@ dependencies = [ [[package]] name = "icu_locale" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", "displaydoc", "icu", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", "icu_locale_data", - "icu_provider", + "icu_provider 2.0.0-beta1", "potential_utf", "serde", "serde_json", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_locale_core" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", @@ -1372,27 +1382,78 @@ dependencies = [ "iai", "icu", "icu_benchmark_macros", - "icu_provider", - "litemap", + "icu_provider 2.0.0-beta1", + "litemap 0.7.4", "postcard", "potential_utf", "serde", "serde_json", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_locale_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap 0.7.3", + "tinystr 0.7.6", + "writeable 0.5.5", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider 1.5.0", + "tinystr 0.7.6", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + [[package]] name = "icu_normalizer" -version = "2.0.0-dev" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections 1.5.0", + "icu_normalizer_data 1.5.0", + "icu_properties 1.5.1", + "icu_provider 1.5.0", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0-beta1" dependencies = [ "arraystring", "arrayvec", @@ -1402,21 +1463,27 @@ dependencies = [ "detone", "displaydoc", "icu", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", + "icu_collections 2.0.0-beta1", + "icu_normalizer_data 2.0.0-beta1", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "serde", "smallvec", "utf16_iter", "utf8_iter", "write16", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_normalizer_data" -version = "2.0.0-dev" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] @@ -1428,20 +1495,20 @@ dependencies = [ "databake", "displaydoc", "either", - "litemap", + "litemap 0.7.4", "postcard", "rmp-serde", "serde", "serde_json", - "writeable", - "yoke", - "zerofrom", - "zerovec", + "writeable 0.6.0", + "yoke 0.7.5", + "zerofrom 0.1.5", + "zerovec 0.11.0", ] [[package]] name = "icu_plurals" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", @@ -1451,16 +1518,16 @@ dependencies = [ "icu_benchmark_macros", "icu_locale_core", "icu_plurals_data", - "icu_provider", + "icu_provider 2.0.0-beta1", "postcard", "serde", "serde_json", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_plurals_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1468,32 +1535,70 @@ dependencies = [ [[package]] name = "icu_properties" -version = "2.0.0-dev" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections 1.5.0", + "icu_locid_transform", + "icu_properties_data 1.5.0", + "icu_provider 1.5.0", + "tinystr 0.7.6", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_properties" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "icu", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", - "icu_properties_data", - "icu_provider", + "icu_properties_data 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "potential_utf", "serde", "unicode-bidi", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_properties_data" -version = "2.0.0-dev" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_properties_data" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "2.0.0-dev" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros 1.5.0", + "stable_deref_trait", + "tinystr 0.7.6", + "writeable 0.5.5", + "yoke 0.7.4", + "zerofrom 0.1.4", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_provider" +version = "2.0.0-beta1" dependencies = [ "bincode", "criterion", @@ -1504,77 +1609,77 @@ dependencies = [ "icu_locale", "icu_locale_core", "icu_provider_adapters", - "icu_provider_macros", + "icu_provider_macros 2.0.0-beta1", "log", "postcard", "serde", "serde_json", "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "yoke 0.7.5", + "zerofrom 0.1.5", + "zerovec 0.11.0", ] [[package]] name = "icu_provider_adapters" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "databake", "icu_locale", - "icu_provider", + "icu_provider 2.0.0-beta1", "serde", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_provider_baked" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "crlify", "databake", "heck 0.5.0", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_export", "icu_provider_registry", "log", "proc-macro2", - "writeable", + "writeable 0.6.0", "zerotrie", ] [[package]] name = "icu_provider_blob" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "criterion", "databake", "icu_locale", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_export", "log", "postcard", "serde", "twox-hash", - "writeable", + "writeable 0.6.0", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_provider_export" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "elsa", "icu", "icu_locale", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_baked", "icu_provider_blob", "icu_provider_fs", @@ -1583,12 +1688,12 @@ dependencies = [ "postcard", "rayon", "simple_logger", - "writeable", + "writeable 0.6.0", ] [[package]] name = "icu_provider_fs" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "bincode", "criterion", @@ -1596,37 +1701,48 @@ dependencies = [ "displaydoc", "icu_benchmark_macros", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_export", "log", "postcard", "serde", "serde-json-core", "serde_json", - "writeable", + "writeable 0.6.0", ] [[package]] name = "icu_provider_macros" -version = "2.0.0-dev" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ - "icu_provider", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", +] + +[[package]] +name = "icu_provider_macros" +version = "2.0.0-beta1" +dependencies = [ + "icu_provider 2.0.0-beta1", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] name = "icu_provider_registry" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu", - "icu_provider", + "icu_provider 2.0.0-beta1", ] [[package]] name = "icu_provider_source" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -1634,16 +1750,16 @@ dependencies = [ "elsa", "icu", "icu_codepointtrie_builder", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_experimental", "icu_pattern", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_export", "icu_provider_registry", "icu_segmenter", "itertools", - "litemap", + "litemap 0.7.4", "log", "ndarray", "num-bigint", @@ -1656,41 +1772,41 @@ dependencies = [ "serde-aux", "serde_json", "simple_logger", - "tinystr", + "tinystr 0.8.0", "toml", "twox-hash", "ureq", - "writeable", + "writeable 0.6.0", "zerotrie", - "zerovec", + "zerovec 0.11.0", "zip", ] [[package]] name = "icu_segmenter" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "core_maths", "criterion", "databake", "displaydoc", "icu", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", - "icu_properties", - "icu_provider", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "icu_segmenter_data", "itertools", "potential_utf", "serde", "serde_json", "utf8_iter", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_segmenter_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -1698,37 +1814,48 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "databake", "displaydoc", "icu", "icu_calendar", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_timezone_data", "ixdtf", "serde", - "tinystr", + "tinystr 0.8.0", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_timezone_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer 1.5.0", + "icu_properties 1.5.1", ] [[package]] @@ -1764,12 +1891,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - [[package]] name = "itertools" version = "0.10.5" @@ -1781,9 +1902,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "ixdtf" @@ -1797,9 +1918,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1818,9 +1939,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libc_alloc" @@ -1830,9 +1951,15 @@ checksum = "7581282928bc99698341d1de7590964c28db747c164eaac9409432a3eaed098a" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "litemap" @@ -1847,7 +1974,7 @@ dependencies = [ "rkyv", "serde", "serde_json", - "yoke", + "yoke 0.7.5", ] [[package]] @@ -1892,20 +2019,20 @@ dependencies = [ "databake", "displaydoc", "icu", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_blob", "icu_provider_export", "icu_provider_fs", "icu_provider_source", "itertools", - "litemap", + "litemap 0.7.4", "lru", "serde", "serde-aux", "time", - "tinystr", - "writeable", + "tinystr 0.8.0", + "writeable 0.6.0", ] [[package]] @@ -1936,15 +2063,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2064,18 +2182,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -2135,9 +2253,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "plotters" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits", "plotters-backend", @@ -2148,24 +2266,24 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] [[package]] name = "postcard" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ee10b999a00ca189ac2cb99f5db1ca71fb7371e3d5f493b879ca95d2a67220" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -2181,8 +2299,8 @@ dependencies = [ "databake", "serde", "serde_json", - "writeable", - "zerovec", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] @@ -2202,9 +2320,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2231,9 +2349,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4e75767fbc9d92b90e4d0c011f61358cde9513b31ef07ea3631b15ffc3b4fd" +checksum = "679341d22c78c6c649893cbd6c3278dcbe9fc4faa62fea3a9296ae2b50c14625" dependencies = [ "bitflags", "getopts", @@ -2250,9 +2368,9 @@ checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2340,18 +2458,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2361,9 +2479,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2372,9 +2490,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" @@ -2393,7 +2511,7 @@ dependencies = [ "log", "nom", "serde", - "zerovec", + "zerovec 0.11.0", ] [[package]] @@ -2485,9 +2603,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -2503,9 +2621,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "log", "once_cell", @@ -2518,15 +2636,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -2583,9 +2701,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -2612,20 +2730,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -2641,9 +2759,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple_logger" @@ -2739,9 +2857,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -2755,7 +2873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fa6dca1fdb7b2ed46dd534a326725419d4fb10f23d8c85a8b2860e5eb25d0f9" dependencies = [ "proc-macro2", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -2766,7 +2884,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -2814,6 +2932,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec 0.10.4", +] + [[package]] name = "tinystr" version = "0.8.0" @@ -2826,7 +2954,7 @@ dependencies = [ "rand", "serde", "serde_json", - "zerovec", + "zerovec 0.11.0", ] [[package]] @@ -2889,45 +3017,33 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "untrusted" @@ -2953,9 +3069,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -2982,9 +3098,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "vcell" @@ -3031,9 +3147,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3042,24 +3158,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3067,22 +3183,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" @@ -3157,9 +3273,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -3167,9 +3283,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -3213,7 +3329,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -3224,7 +3340,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", ] [[package]] @@ -3393,6 +3509,12 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "writeable" version = "0.6.0" @@ -3412,6 +3534,18 @@ dependencies = [ "tap", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive 0.7.4", + "zerofrom 0.1.4", +] + [[package]] name = "yoke" version = "0.7.5" @@ -3420,8 +3554,20 @@ dependencies = [ "postcard", "serde", "stable_deref_trait", - "yoke-derive", - "zerofrom", + "yoke-derive 0.7.5", + "zerofrom 0.1.5", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -3430,10 +3576,10 @@ version = "0.7.5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", "synstructure", - "yoke", - "zerovec", + "yoke 0.7.5", + "zerovec 0.11.0", ] [[package]] @@ -3454,14 +3600,35 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive 0.1.4", ] [[package]] name = "zerofrom" version = "0.1.5" dependencies = [ - "zerofrom-derive", + "zerofrom-derive 0.1.5", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -3470,10 +3637,10 @@ version = "0.1.5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.75", + "syn 2.0.89", "synstructure", - "zerofrom", - "zerovec", + "zerofrom 0.1.5", + "zerovec 0.11.0", ] [[package]] @@ -3492,17 +3659,28 @@ dependencies = [ "displaydoc", "icu_benchmark_macros", "icu_locale_core", - "litemap", + "litemap 0.7.4", "postcard", "rand", "rand_pcg", "rmp-serde", "serde", "serde_json", - "writeable", - "yoke", - "zerofrom", - "zerovec", + "writeable 0.6.0", + "yoke 0.7.5", + "zerofrom 0.1.5", + "zerovec 0.11.0", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke 0.7.4", + "zerofrom 0.1.4", + "zerovec-derive 0.10.3", ] [[package]] @@ -3524,9 +3702,20 @@ dependencies = [ "serde", "serde_json", "twox-hash", - "yoke", - "zerofrom", - "zerovec-derive", + "yoke 0.7.5", + "zerofrom 0.1.5", + "zerovec-derive 0.11.0", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -3538,9 +3727,9 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.75", - "zerofrom", - "zerovec", + "syn 2.0.89", + "zerofrom 0.1.5", + "zerovec 0.11.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5f1ea969867..3c38e6de643 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,7 +106,7 @@ exclude = [ ] [workspace.package] -version = "2.0.0-dev" +version = "2.0.0-beta1" rust-version = "1.71.1" authors = ["The ICU4X Project Developers"] edition = "2021" @@ -130,57 +130,57 @@ include = [ # ICU4X core # These use non-tilde deps, see https://github.com/unicode-org/icu4x/issues/4343 -icu_locale_core = { version = "2.0.0-dev", path = "components/locale_core", default-features = false } -icu_provider = { version = "2.0.0-dev", path = "provider/core", default-features = false } +icu_locale_core = { version = "2.0.0-beta1", path = "components/locale_core", default-features = false } +icu_provider = { version = "2.0.0-beta1", path = "provider/core", default-features = false } icu_pattern = { version = "0.3.0", path = "components/pattern", default-features = false } # Components -icu = { version = "~2.0.0-dev", path = "components/icu", default-features = false } -icu_calendar = { version = "~2.0.0-dev", path = "components/calendar", default-features = false } -icu_casemap = { version = "~2.0.0-dev", path = "components/casemap", default-features = false } -icu_collator = { version = "~2.0.0-dev", path = "components/collator", default-features = false } -icu_collections = { version = "~2.0.0-dev", path = "components/collections", default-features = false } +icu = { version = "~2.0.0-beta1", path = "components/icu", default-features = false } +icu_calendar = { version = "~2.0.0-beta1", path = "components/calendar", default-features = false } +icu_casemap = { version = "~2.0.0-beta1", path = "components/casemap", default-features = false } +icu_collator = { version = "~2.0.0-beta1", path = "components/collator", default-features = false } +icu_collections = { version = "~2.0.0-beta1", path = "components/collections", default-features = false } icu_codepointtrie_builder = { version = "~0.4.0-dev", path = "components/collections/codepointtrie_builder", default-features = false } -icu_datetime = { version = "~2.0.0-dev", path = "components/datetime", default-features = false } -icu_decimal = { version = "~2.0.0-dev", path = "components/decimal", default-features = false } +icu_datetime = { version = "~2.0.0-beta1", path = "components/datetime", default-features = false } +icu_decimal = { version = "~2.0.0-beta1", path = "components/decimal", default-features = false } icu_experimental = { version = "~0.2.0", path = "components/experimental", default-features = false } -icu_list = { version = "~2.0.0-dev", path = "components/list", default-features = false } -icu_locale = { version = "~2.0.0-dev", path = "components/locale", default-features = false } -icu_normalizer = { version = "~2.0.0-dev", path = "components/normalizer", default-features = false } -icu_plurals = { version = "~2.0.0-dev", path = "components/plurals", default-features = false } -icu_properties = { version = "~2.0.0-dev", path = "components/properties", default-features = false } -icu_segmenter = { version = "~2.0.0-dev", path = "components/segmenter", default-features = false } -icu_timezone = { version = "~2.0.0-dev", path = "components/timezone", default-features = false } +icu_list = { version = "~2.0.0-beta1", path = "components/list", default-features = false } +icu_locale = { version = "~2.0.0-beta1", path = "components/locale", default-features = false } +icu_normalizer = { version = "~2.0.0-beta1", path = "components/normalizer", default-features = false } +icu_plurals = { version = "~2.0.0-beta1", path = "components/plurals", default-features = false } +icu_properties = { version = "~2.0.0-beta1", path = "components/properties", default-features = false } +icu_segmenter = { version = "~2.0.0-beta1", path = "components/segmenter", default-features = false } +icu_timezone = { version = "~2.0.0-beta1", path = "components/timezone", default-features = false } # FFI -icu_capi = { version = "~2.0.0-dev", path = "ffi/capi", default-features = false } +icu_capi = { version = "~2.0.0-beta1", path = "ffi/capi", default-features = false } # icu4x_ecma402 never used as a dep # icu_freertos never used as a dep # icu_harfbuzz never used as a dep # Provider -icu_provider_export = { version = "~2.0.0-dev", path = "provider/export", default-features = false } -icu_provider_source = { version = "~2.0.0-dev", path = "provider/source", default-features = false } -icu_provider_macros = { version = "~2.0.0-dev", path = "provider/core/macros", default-features = false } -icu_provider_adapters = { version = "~2.0.0-dev", path = "provider/adapters", default-features = false } -icu_provider_baked = { version = "~2.0.0-dev", path = "provider/baked", default-features = false } -icu_provider_blob = { version = "~2.0.0-dev", path = "provider/blob", default-features = false } -icu_provider_fs = { version = "~2.0.0-dev", path = "provider/fs", default-features = false } -icu_provider_registry = { version = "~2.0.0-dev", path = "provider/registry", default-features = false } +icu_provider_export = { version = "~2.0.0-beta1", path = "provider/export", default-features = false } +icu_provider_source = { version = "~2.0.0-beta1", path = "provider/source", default-features = false } +icu_provider_macros = { version = "~2.0.0-beta1", path = "provider/core/macros", default-features = false } +icu_provider_adapters = { version = "~2.0.0-beta1", path = "provider/adapters", default-features = false } +icu_provider_baked = { version = "~2.0.0-beta1", path = "provider/baked", default-features = false } +icu_provider_blob = { version = "~2.0.0-beta1", path = "provider/blob", default-features = false } +icu_provider_fs = { version = "~2.0.0-beta1", path = "provider/fs", default-features = false } +icu_provider_registry = { version = "~2.0.0-beta1", path = "provider/registry", default-features = false } # Baked data -icu_calendar_data = { version = "~2.0.0-dev", path = "provider/data/calendar", default-features = false } -icu_casemap_data = { version = "~2.0.0-dev", path = "provider/data/casemap", default-features = false } -icu_collator_data = { version = "~2.0.0-dev", path = "provider/data/collator", default-features = false } -icu_datetime_data = { version = "~2.0.0-dev", path = "provider/data/datetime", default-features = false } -icu_decimal_data = { version = "~2.0.0-dev", path = "provider/data/decimal", default-features = false } -icu_list_data = { version = "~2.0.0-dev", path = "provider/data/list", default-features = false } -icu_locale_data = { version = "~2.0.0-dev", path = "provider/data/locale", default-features = false } -icu_normalizer_data = { version = "~2.0.0-dev", path = "provider/data/normalizer", default-features = false } -icu_plurals_data = { version = "~2.0.0-dev", path = "provider/data/plurals", default-features = false } -icu_properties_data = { version = "~2.0.0-dev", path = "provider/data/properties", default-features = false } -icu_segmenter_data = { version = "~2.0.0-dev", path = "provider/data/segmenter", default-features = false } -icu_timezone_data = { version = "~2.0.0-dev", path = "provider/data/timezone", default-features = false } +icu_calendar_data = { version = "~2.0.0-beta1", path = "provider/data/calendar", default-features = false } +icu_casemap_data = { version = "~2.0.0-beta1", path = "provider/data/casemap", default-features = false } +icu_collator_data = { version = "~2.0.0-beta1", path = "provider/data/collator", default-features = false } +icu_datetime_data = { version = "~2.0.0-beta1", path = "provider/data/datetime", default-features = false } +icu_decimal_data = { version = "~2.0.0-beta1", path = "provider/data/decimal", default-features = false } +icu_list_data = { version = "~2.0.0-beta1", path = "provider/data/list", default-features = false } +icu_locale_data = { version = "~2.0.0-beta1", path = "provider/data/locale", default-features = false } +icu_normalizer_data = { version = "~2.0.0-beta1", path = "provider/data/normalizer", default-features = false } +icu_plurals_data = { version = "~2.0.0-beta1", path = "provider/data/plurals", default-features = false } +icu_properties_data = { version = "~2.0.0-beta1", path = "provider/data/properties", default-features = false } +icu_segmenter_data = { version = "~2.0.0-beta1", path = "provider/data/segmenter", default-features = false } +icu_timezone_data = { version = "~2.0.0-beta1", path = "provider/data/timezone", default-features = false } icu_experimental_data = { version = "~0.2.0-dev", path = "provider/data/experimental", default-features = false } # Utils @@ -213,10 +213,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" } # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."` # Diplomat must be published preceding a new ICU4X release but may use git versions in between -diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } +diplomat = { version = "0.9.0", default-features = false } +diplomat-runtime = { version = "0.9.0", default-features = false } +diplomat_core = { version = "0.9.0", default-features = false } +diplomat-tool = { version = "0.9.0", default-features = false } # EXTERNAL DEPENDENCIES # diff --git a/ffi/capi/bindings/demo_gen/AnyCalendarKind.mjs b/ffi/capi/bindings/demo_gen/AnyCalendarKind.mjs index e2387a993ea..4ef87ea7219 100644 --- a/ffi/capi/bindings/demo_gen/AnyCalendarKind.mjs +++ b/ffi/capi/bindings/demo_gen/AnyCalendarKind.mjs @@ -1,10 +1,9 @@ import { AnyCalendarKind } from "icu4x" -export function bcp47() { - var terminusArgs = arguments; +export function bcp47(self) { return (function (...args) { return args[0].bcp47 }).apply( null, [ - terminusArgs[0] + self ] ); } diff --git a/ffi/capi/bindings/demo_gen/CaseMapper.mjs b/ffi/capi/bindings/demo_gen/CaseMapper.mjs index 5d0cd8d50e7..43d85b22676 100644 --- a/ffi/capi/bindings/demo_gen/CaseMapper.mjs +++ b/ffi/capi/bindings/demo_gen/CaseMapper.mjs @@ -2,8 +2,7 @@ import { CaseMapper } from "icu4x" import { DataProvider } from "icu4x" import { Locale } from "icu4x" import { TitlecaseOptions } from "icu4x" -export function lowercase() { - var terminusArgs = arguments; +export function lowercase(s, name) { return (function (...args) { return args[0].lowercase(...args.slice(1)) }).apply( null, [ @@ -17,18 +16,17 @@ export function lowercase() { ) ] ), - terminusArgs[0], + s, Locale.fromString.apply( null, [ - terminusArgs[1] + name ] ) ] ); } -export function uppercase() { - var terminusArgs = arguments; +export function uppercase(s, name) { return (function (...args) { return args[0].uppercase(...args.slice(1)) }).apply( null, [ @@ -42,18 +40,17 @@ export function uppercase() { ) ] ), - terminusArgs[0], + s, Locale.fromString.apply( null, [ - terminusArgs[1] + name ] ) ] ); } -export function titlecaseSegmentWithOnlyCaseData() { - var terminusArgs = arguments; +export function titlecaseSegmentWithOnlyCaseData(s, name, leading_adjustment, trailing_case) { return (function (...args) { return args[0].titlecaseSegmentWithOnlyCaseData(...args.slice(1)) }).apply( null, [ @@ -67,27 +64,28 @@ export function titlecaseSegmentWithOnlyCaseData() { ) ] ), - terminusArgs[0], + s, Locale.fromString.apply( null, [ - terminusArgs[1] + name ] ), (function (...args) { - return new TitlecaseOptions(...args); + return new TitlecaseOptions({ + leadingAdjustment: args[0], + trailingCase: args[1]}); }).apply( null, [ - terminusArgs[2], - terminusArgs[3] + leading_adjustment, + trailing_case ] ) ] ); } -export function fold() { - var terminusArgs = arguments; +export function fold(s) { return (function (...args) { return args[0].fold(...args.slice(1)) }).apply( null, [ @@ -101,12 +99,11 @@ export function fold() { ) ] ), - terminusArgs[0] + s ] ); } -export function foldTurkic() { - var terminusArgs = arguments; +export function foldTurkic(s) { return (function (...args) { return args[0].foldTurkic(...args.slice(1)) }).apply( null, [ @@ -120,7 +117,7 @@ export function foldTurkic() { ) ] ), - terminusArgs[0] + s ] ); } diff --git a/ffi/capi/bindings/demo_gen/ComposingNormalizer.mjs b/ffi/capi/bindings/demo_gen/ComposingNormalizer.mjs index 3c727ded905..af89f08f2ad 100644 --- a/ffi/capi/bindings/demo_gen/ComposingNormalizer.mjs +++ b/ffi/capi/bindings/demo_gen/ComposingNormalizer.mjs @@ -1,7 +1,6 @@ import { ComposingNormalizer } from "icu4x" import { DataProvider } from "icu4x" -export function normalize() { - var terminusArgs = arguments; +export function normalize(s) { return (function (...args) { return args[0].normalize(...args.slice(1)) }).apply( null, [ @@ -15,7 +14,7 @@ export function normalize() { ) ] ), - terminusArgs[0] + s ] ); } diff --git a/ffi/capi/bindings/demo_gen/Date.mjs b/ffi/capi/bindings/demo_gen/Date.mjs index 68fb131235b..b09cb2d5401 100644 --- a/ffi/capi/bindings/demo_gen/Date.mjs +++ b/ffi/capi/bindings/demo_gen/Date.mjs @@ -2,17 +2,16 @@ import { Calendar } from "icu4x" import { DataProvider } from "icu4x" import { Date } from "icu4x" import { Locale } from "icu4x" -export function monthCode() { - var terminusArgs = arguments; +export function monthCode(year, month, day, name) { return (function (...args) { return args[0].monthCode }).apply( null, [ Date.fromIsoInCalendar.apply( null, [ - terminusArgs[0], - terminusArgs[1], - terminusArgs[2], + year, + month, + day, Calendar.createForLocale.apply( null, [ @@ -24,7 +23,7 @@ export function monthCode() { Locale.fromString.apply( null, [ - terminusArgs[3] + name ] ) ] @@ -34,17 +33,16 @@ export function monthCode() { ] ); } -export function era() { - var terminusArgs = arguments; +export function era(year, month, day, name) { return (function (...args) { return args[0].era }).apply( null, [ Date.fromIsoInCalendar.apply( null, [ - terminusArgs[0], - terminusArgs[1], - terminusArgs[2], + year, + month, + day, Calendar.createForLocale.apply( null, [ @@ -56,7 +54,7 @@ export function era() { Locale.fromString.apply( null, [ - terminusArgs[3] + name ] ) ] diff --git a/ffi/capi/bindings/demo_gen/DateFormatter.d.ts b/ffi/capi/bindings/demo_gen/DateFormatter.d.ts index b0ace5310b0..b3b477dddee 100644 --- a/ffi/capi/bindings/demo_gen/DateFormatter.d.ts +++ b/ffi/capi/bindings/demo_gen/DateFormatter.d.ts @@ -6,7 +6,7 @@ import { DateTime } from "icu4x" import { IsoDate } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" -export function formatDate(name: string, length: DateTimeLength, year: number, month: number, day: number, name: string); +export function formatDate(name: string, length: DateTimeLength, year: number, month: number, day: number, name_1: string); export function formatIsoDate(name: string, length: DateTimeLength, year: number, month: number, day: number); -export function formatDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name: string); +export function formatDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name_1: string); export function formatIsoDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number); diff --git a/ffi/capi/bindings/demo_gen/DateFormatter.mjs b/ffi/capi/bindings/demo_gen/DateFormatter.mjs index e6ac5c14b13..032117ad9b7 100644 --- a/ffi/capi/bindings/demo_gen/DateFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/DateFormatter.mjs @@ -6,8 +6,7 @@ import { DateTime } from "icu4x" import { IsoDate } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" -export function formatDate() { - var terminusArgs = arguments; +export function formatDate(name, length, year, month, day, name_1) { return (function (...args) { return args[0].formatDate(...args.slice(1)) }).apply( null, [ @@ -22,18 +21,18 @@ export function formatDate() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), Date.fromIsoInCalendar.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], + year, + month, + day, Calendar.createForLocale.apply( null, [ @@ -45,7 +44,7 @@ export function formatDate() { Locale.fromString.apply( null, [ - terminusArgs[5] + name_1 ] ) ] @@ -55,8 +54,7 @@ export function formatDate() { ] ); } -export function formatIsoDate() { - var terminusArgs = arguments; +export function formatIsoDate(name, length, year, month, day) { return (function (...args) { return args[0].formatIsoDate(...args.slice(1)) }).apply( null, [ @@ -71,25 +69,24 @@ export function formatIsoDate() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDate.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4] + year, + month, + day ] ) ] ); } -export function formatDatetime() { - var terminusArgs = arguments; +export function formatDatetime(name, length, year, month, day, hour, minute, second, nanosecond, name_1) { return (function (...args) { return args[0].formatDatetime(...args.slice(1)) }).apply( null, [ @@ -104,22 +101,22 @@ export function formatDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), DateTime.fromIsoInCalendar.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8], + year, + month, + day, + hour, + minute, + second, + nanosecond, Calendar.createForLocale.apply( null, [ @@ -131,7 +128,7 @@ export function formatDatetime() { Locale.fromString.apply( null, [ - terminusArgs[9] + name_1 ] ) ] @@ -141,8 +138,7 @@ export function formatDatetime() { ] ); } -export function formatIsoDatetime() { - var terminusArgs = arguments; +export function formatIsoDatetime(name, length, year, month, day, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatIsoDatetime(...args.slice(1)) }).apply( null, [ @@ -157,22 +153,22 @@ export function formatIsoDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ) ] diff --git a/ffi/capi/bindings/demo_gen/DateTime.mjs b/ffi/capi/bindings/demo_gen/DateTime.mjs index a49cf6275df..cfbf86abf84 100644 --- a/ffi/capi/bindings/demo_gen/DateTime.mjs +++ b/ffi/capi/bindings/demo_gen/DateTime.mjs @@ -2,21 +2,20 @@ import { Calendar } from "icu4x" import { DataProvider } from "icu4x" import { DateTime } from "icu4x" import { Locale } from "icu4x" -export function monthCode() { - var terminusArgs = arguments; +export function monthCode(year, month, day, hour, minute, second, nanosecond, name) { return (function (...args) { return args[0].monthCode }).apply( null, [ DateTime.fromIsoInCalendar.apply( null, [ - terminusArgs[0], - terminusArgs[1], - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], + year, + month, + day, + hour, + minute, + second, + nanosecond, Calendar.createForLocale.apply( null, [ @@ -28,7 +27,7 @@ export function monthCode() { Locale.fromString.apply( null, [ - terminusArgs[7] + name ] ) ] @@ -38,21 +37,20 @@ export function monthCode() { ] ); } -export function era() { - var terminusArgs = arguments; +export function era(year, month, day, hour, minute, second, nanosecond, name) { return (function (...args) { return args[0].era }).apply( null, [ DateTime.fromIsoInCalendar.apply( null, [ - terminusArgs[0], - terminusArgs[1], - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], + year, + month, + day, + hour, + minute, + second, + nanosecond, Calendar.createForLocale.apply( null, [ @@ -64,7 +62,7 @@ export function era() { Locale.fromString.apply( null, [ - terminusArgs[7] + name ] ) ] diff --git a/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts b/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts index 1e77990cc80..95a067a77f7 100644 --- a/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts +++ b/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts @@ -4,5 +4,5 @@ import { DateTime } from "icu4x" import { DateTimeFormatter } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" -export function formatDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name: string); +export function formatDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name_1: string); export function formatIsoDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number); diff --git a/ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs b/ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs index bc63d65f2a2..db8ebea067d 100644 --- a/ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs @@ -4,8 +4,7 @@ import { DateTime } from "icu4x" import { DateTimeFormatter } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" -export function formatDatetime() { - var terminusArgs = arguments; +export function formatDatetime(name, length, year, month, day, hour, minute, second, nanosecond, name_1) { return (function (...args) { return args[0].formatDatetime(...args.slice(1)) }).apply( null, [ @@ -20,22 +19,22 @@ export function formatDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), DateTime.fromIsoInCalendar.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8], + year, + month, + day, + hour, + minute, + second, + nanosecond, Calendar.createForLocale.apply( null, [ @@ -47,7 +46,7 @@ export function formatDatetime() { Locale.fromString.apply( null, [ - terminusArgs[9] + name_1 ] ) ] @@ -57,8 +56,7 @@ export function formatDatetime() { ] ); } -export function formatIsoDatetime() { - var terminusArgs = arguments; +export function formatIsoDatetime(name, length, year, month, day, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatIsoDatetime(...args.slice(1)) }).apply( null, [ @@ -73,22 +71,22 @@ export function formatIsoDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ) ] diff --git a/ffi/capi/bindings/demo_gen/DecomposingNormalizer.mjs b/ffi/capi/bindings/demo_gen/DecomposingNormalizer.mjs index 064d183d4c7..0128c48eb0d 100644 --- a/ffi/capi/bindings/demo_gen/DecomposingNormalizer.mjs +++ b/ffi/capi/bindings/demo_gen/DecomposingNormalizer.mjs @@ -1,7 +1,6 @@ import { DataProvider } from "icu4x" import { DecomposingNormalizer } from "icu4x" -export function normalize() { - var terminusArgs = arguments; +export function normalize(s) { return (function (...args) { return args[0].normalize(...args.slice(1)) }).apply( null, [ @@ -15,7 +14,7 @@ export function normalize() { ) ] ), - terminusArgs[0] + s ] ); } diff --git a/ffi/capi/bindings/demo_gen/FixedDecimal.mjs b/ffi/capi/bindings/demo_gen/FixedDecimal.mjs index 870b8559089..f49ed4c7027 100644 --- a/ffi/capi/bindings/demo_gen/FixedDecimal.mjs +++ b/ffi/capi/bindings/demo_gen/FixedDecimal.mjs @@ -1,14 +1,13 @@ import { FixedDecimal } from "icu4x" -export function toString() { - var terminusArgs = arguments; +export function toString(f, magnitude) { return (function (...args) { return args[0].toString(...args.slice(1)) }).apply( null, [ FixedDecimal.fromNumberWithLowerMagnitude.apply( null, [ - terminusArgs[0], - terminusArgs[1] + f, + magnitude ] ) ] diff --git a/ffi/capi/bindings/demo_gen/FixedDecimalFormatter.mjs b/ffi/capi/bindings/demo_gen/FixedDecimalFormatter.mjs index 340fb900b38..3f219a12974 100644 --- a/ffi/capi/bindings/demo_gen/FixedDecimalFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/FixedDecimalFormatter.mjs @@ -2,8 +2,7 @@ import { DataProvider } from "icu4x" import { FixedDecimal } from "icu4x" import { FixedDecimalFormatter } from "icu4x" import { Locale } from "icu4x" -export function format() { - var terminusArgs = arguments; +export function format(name, groupingStrategy, f, magnitude) { return (function (...args) { return args[0].format(...args.slice(1)) }).apply( null, [ @@ -18,17 +17,17 @@ export function format() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + groupingStrategy ] ), FixedDecimal.fromNumberWithLowerMagnitude.apply( null, [ - terminusArgs[2], - terminusArgs[3] + f, + magnitude ] ) ] diff --git a/ffi/capi/bindings/demo_gen/GregorianDateFormatter.mjs b/ffi/capi/bindings/demo_gen/GregorianDateFormatter.mjs index 3b74ba048b0..8ec001fa95c 100644 --- a/ffi/capi/bindings/demo_gen/GregorianDateFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/GregorianDateFormatter.mjs @@ -3,8 +3,7 @@ import { GregorianDateFormatter } from "icu4x" import { IsoDate } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" -export function formatIsoDate() { - var terminusArgs = arguments; +export function formatIsoDate(name, length, year, month, day) { return (function (...args) { return args[0].formatIsoDate(...args.slice(1)) }).apply( null, [ @@ -19,25 +18,24 @@ export function formatIsoDate() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDate.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4] + year, + month, + day ] ) ] ); } -export function formatIsoDatetime() { - var terminusArgs = arguments; +export function formatIsoDatetime(name, length, year, month, day, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatIsoDatetime(...args.slice(1)) }).apply( null, [ @@ -52,22 +50,22 @@ export function formatIsoDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ) ] diff --git a/ffi/capi/bindings/demo_gen/GregorianDateTimeFormatter.mjs b/ffi/capi/bindings/demo_gen/GregorianDateTimeFormatter.mjs index 28c3ba3ac8a..b66d531a6de 100644 --- a/ffi/capi/bindings/demo_gen/GregorianDateTimeFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/GregorianDateTimeFormatter.mjs @@ -2,8 +2,7 @@ import { DataProvider } from "icu4x" import { GregorianDateTimeFormatter } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" -export function formatIsoDatetime() { - var terminusArgs = arguments; +export function formatIsoDatetime(name, length, year, month, day, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatIsoDatetime(...args.slice(1)) }).apply( null, [ @@ -18,22 +17,22 @@ export function formatIsoDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ) ] diff --git a/ffi/capi/bindings/demo_gen/GregorianZonedDateTimeFormatter.mjs b/ffi/capi/bindings/demo_gen/GregorianZonedDateTimeFormatter.mjs index 9bba799cce2..e058b4b327e 100644 --- a/ffi/capi/bindings/demo_gen/GregorianZonedDateTimeFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/GregorianZonedDateTimeFormatter.mjs @@ -3,8 +3,7 @@ import { GregorianZonedDateTimeFormatter } from "icu4x" import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" import { TimeZoneInfo } from "icu4x" -export function formatIsoDatetimeWithCustomTimeZone() { - var terminusArgs = arguments; +export function formatIsoDatetimeWithCustomTimeZone(name, length, year, month, day, hour, minute, second, nanosecond, bcp47Id, offsetSeconds, dst) { return (function (...args) { return args[0].formatIsoDatetimeWithCustomTimeZone(...args.slice(1)) }).apply( null, [ @@ -19,30 +18,30 @@ export function formatIsoDatetimeWithCustomTimeZone() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ), TimeZoneInfo.fromParts.apply( null, [ - terminusArgs[9], - terminusArgs[10], - terminusArgs[11] + bcp47Id, + offsetSeconds, + dst ] ) ] diff --git a/ffi/capi/bindings/demo_gen/ListFormatter.mjs b/ffi/capi/bindings/demo_gen/ListFormatter.mjs index ea5d909bbf0..7f8468deb31 100644 --- a/ffi/capi/bindings/demo_gen/ListFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/ListFormatter.mjs @@ -1,8 +1,7 @@ import { DataProvider } from "icu4x" import { ListFormatter } from "icu4x" import { Locale } from "icu4x" -export function format() { - var terminusArgs = arguments; +export function format(name, length, list) { return (function (...args) { return args[0].format(...args.slice(1)) }).apply( null, [ @@ -17,13 +16,13 @@ export function format() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), - terminusArgs[2] + list ] ); } diff --git a/ffi/capi/bindings/demo_gen/Locale.mjs b/ffi/capi/bindings/demo_gen/Locale.mjs index 93b2b29fbf3..9e51ffd9dd3 100644 --- a/ffi/capi/bindings/demo_gen/Locale.mjs +++ b/ffi/capi/bindings/demo_gen/Locale.mjs @@ -1,93 +1,86 @@ import { Locale } from "icu4x" -export function basename() { - var terminusArgs = arguments; +export function basename(name) { return (function (...args) { return args[0].basename }).apply( null, [ Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ) ] ); } -export function getUnicodeExtension() { - var terminusArgs = arguments; +export function getUnicodeExtension(name, s) { return (function (...args) { return args[0].getUnicodeExtension(...args.slice(1)) }).apply( null, [ Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + s ] ); } -export function language() { - var terminusArgs = arguments; +export function language(name) { return (function (...args) { return args[0].language }).apply( null, [ Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ) ] ); } -export function region() { - var terminusArgs = arguments; +export function region(name) { return (function (...args) { return args[0].region }).apply( null, [ Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ) ] ); } -export function script() { - var terminusArgs = arguments; +export function script(name) { return (function (...args) { return args[0].script }).apply( null, [ Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ) ] ); } -export function normalize() { - var terminusArgs = arguments; +export function normalize(s) { return Locale.normalize.apply( null, [ - terminusArgs[0] + s ] ); } -export function toString() { - var terminusArgs = arguments; +export function toString(name) { return (function (...args) { return args[0].toString(...args.slice(1)) }).apply( null, [ Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ) ] diff --git a/ffi/capi/bindings/demo_gen/TimeFormatter.d.ts b/ffi/capi/bindings/demo_gen/TimeFormatter.d.ts index c42843c6f1a..5cfdcb3317f 100644 --- a/ffi/capi/bindings/demo_gen/TimeFormatter.d.ts +++ b/ffi/capi/bindings/demo_gen/TimeFormatter.d.ts @@ -6,5 +6,5 @@ import { Locale } from "icu4x" import { Time } from "icu4x" import { TimeFormatter } from "icu4x" export function formatTime(name: string, length: DateTimeLength, hour: number, minute: number, second: number, nanosecond: number); -export function formatDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name: string); +export function formatDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name_1: string); export function formatIsoDatetime(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number); diff --git a/ffi/capi/bindings/demo_gen/TimeFormatter.mjs b/ffi/capi/bindings/demo_gen/TimeFormatter.mjs index a81bbe426b5..f0253ac045e 100644 --- a/ffi/capi/bindings/demo_gen/TimeFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/TimeFormatter.mjs @@ -5,8 +5,7 @@ import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" import { Time } from "icu4x" import { TimeFormatter } from "icu4x" -export function formatTime() { - var terminusArgs = arguments; +export function formatTime(name, length, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatTime(...args.slice(1)) }).apply( null, [ @@ -21,26 +20,25 @@ export function formatTime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), Time.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5] + hour, + minute, + second, + nanosecond ] ) ] ); } -export function formatDatetime() { - var terminusArgs = arguments; +export function formatDatetime(name, length, year, month, day, hour, minute, second, nanosecond, name_1) { return (function (...args) { return args[0].formatDatetime(...args.slice(1)) }).apply( null, [ @@ -55,22 +53,22 @@ export function formatDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), DateTime.fromIsoInCalendar.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8], + year, + month, + day, + hour, + minute, + second, + nanosecond, Calendar.createForLocale.apply( null, [ @@ -82,7 +80,7 @@ export function formatDatetime() { Locale.fromString.apply( null, [ - terminusArgs[9] + name_1 ] ) ] @@ -92,8 +90,7 @@ export function formatDatetime() { ] ); } -export function formatIsoDatetime() { - var terminusArgs = arguments; +export function formatIsoDatetime(name, length, year, month, day, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatIsoDatetime(...args.slice(1)) }).apply( null, [ @@ -108,22 +105,22 @@ export function formatIsoDatetime() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ) ] diff --git a/ffi/capi/bindings/demo_gen/TimeZoneIdMapper.mjs b/ffi/capi/bindings/demo_gen/TimeZoneIdMapper.mjs index bbac5be5a39..b56c8d2148c 100644 --- a/ffi/capi/bindings/demo_gen/TimeZoneIdMapper.mjs +++ b/ffi/capi/bindings/demo_gen/TimeZoneIdMapper.mjs @@ -1,7 +1,6 @@ import { DataProvider } from "icu4x" import { TimeZoneIdMapper } from "icu4x" -export function ianaToBcp47() { - var terminusArgs = arguments; +export function ianaToBcp47(value) { return (function (...args) { return args[0].ianaToBcp47(...args.slice(1)) }).apply( null, [ @@ -15,12 +14,11 @@ export function ianaToBcp47() { ) ] ), - terminusArgs[0] + value ] ); } -export function normalizeIana() { - var terminusArgs = arguments; +export function normalizeIana(value) { return (function (...args) { return args[0].normalizeIana(...args.slice(1)) }).apply( null, [ @@ -34,12 +32,11 @@ export function normalizeIana() { ) ] ), - terminusArgs[0] + value ] ); } -export function canonicalizeIana() { - var terminusArgs = arguments; +export function canonicalizeIana(value) { return (function (...args) { return args[0].canonicalizeIana(...args.slice(1)) }).apply( null, [ @@ -53,12 +50,11 @@ export function canonicalizeIana() { ) ] ), - terminusArgs[0] + value ] ); } -export function findCanonicalIanaFromBcp47() { - var terminusArgs = arguments; +export function findCanonicalIanaFromBcp47(value) { return (function (...args) { return args[0].findCanonicalIanaFromBcp47(...args.slice(1)) }).apply( null, [ @@ -72,7 +68,7 @@ export function findCanonicalIanaFromBcp47() { ) ] ), - terminusArgs[0] + value ] ); } diff --git a/ffi/capi/bindings/demo_gen/TimeZoneIdMapperWithFastCanonicalization.mjs b/ffi/capi/bindings/demo_gen/TimeZoneIdMapperWithFastCanonicalization.mjs index 1c925149441..32b8dd7f1bf 100644 --- a/ffi/capi/bindings/demo_gen/TimeZoneIdMapperWithFastCanonicalization.mjs +++ b/ffi/capi/bindings/demo_gen/TimeZoneIdMapperWithFastCanonicalization.mjs @@ -1,7 +1,6 @@ import { DataProvider } from "icu4x" import { TimeZoneIdMapperWithFastCanonicalization } from "icu4x" -export function canonicalizeIana() { - var terminusArgs = arguments; +export function canonicalizeIana(value) { return (function (...args) { return args[0].canonicalizeIana(...args.slice(1)) }).apply( null, [ @@ -15,12 +14,11 @@ export function canonicalizeIana() { ) ] ), - terminusArgs[0] + value ] ); } -export function canonicalIanaFromBcp47() { - var terminusArgs = arguments; +export function canonicalIanaFromBcp47(value) { return (function (...args) { return args[0].canonicalIanaFromBcp47(...args.slice(1)) }).apply( null, [ @@ -34,7 +32,7 @@ export function canonicalIanaFromBcp47() { ) ] ), - terminusArgs[0] + value ] ); } diff --git a/ffi/capi/bindings/demo_gen/TimeZoneInfo.mjs b/ffi/capi/bindings/demo_gen/TimeZoneInfo.mjs index 5fa7b2f6b9f..0ace09bb01c 100644 --- a/ffi/capi/bindings/demo_gen/TimeZoneInfo.mjs +++ b/ffi/capi/bindings/demo_gen/TimeZoneInfo.mjs @@ -1,15 +1,14 @@ import { TimeZoneInfo } from "icu4x" -export function timeZoneId() { - var terminusArgs = arguments; +export function timeZoneId(bcp47Id, offsetSeconds, dst) { return (function (...args) { return args[0].timeZoneId }).apply( null, [ TimeZoneInfo.fromParts.apply( null, [ - terminusArgs[0], - terminusArgs[1], - terminusArgs[2] + bcp47Id, + offsetSeconds, + dst ] ) ] diff --git a/ffi/capi/bindings/demo_gen/TitlecaseMapper.mjs b/ffi/capi/bindings/demo_gen/TitlecaseMapper.mjs index 6d5e38582df..c3e80cfaf4c 100644 --- a/ffi/capi/bindings/demo_gen/TitlecaseMapper.mjs +++ b/ffi/capi/bindings/demo_gen/TitlecaseMapper.mjs @@ -2,8 +2,7 @@ import { DataProvider } from "icu4x" import { Locale } from "icu4x" import { TitlecaseMapper } from "icu4x" import { TitlecaseOptions } from "icu4x" -export function titlecaseSegment() { - var terminusArgs = arguments; +export function titlecaseSegment(s, name, leading_adjustment, trailing_case) { return (function (...args) { return args[0].titlecaseSegment(...args.slice(1)) }).apply( null, [ @@ -17,20 +16,22 @@ export function titlecaseSegment() { ) ] ), - terminusArgs[0], + s, Locale.fromString.apply( null, [ - terminusArgs[1] + name ] ), (function (...args) { - return new TitlecaseOptions(...args); + return new TitlecaseOptions({ + leadingAdjustment: args[0], + trailingCase: args[1]}); }).apply( null, [ - terminusArgs[2], - terminusArgs[3] + leading_adjustment, + trailing_case ] ) ] diff --git a/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.d.ts b/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.d.ts index 135c21b691d..5d69f172584 100644 --- a/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.d.ts +++ b/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.d.ts @@ -5,5 +5,5 @@ import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" import { TimeZoneInfo } from "icu4x" import { ZonedDateTimeFormatter } from "icu4x" -export function formatDatetimeWithCustomTimeZone(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name: string, bcp47Id: string, offsetSeconds: number, dst: boolean); +export function formatDatetimeWithCustomTimeZone(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, name_1: string, bcp47Id: string, offsetSeconds: number, dst: boolean); export function formatIsoDatetimeWithCustomTimeZone(name: string, length: DateTimeLength, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number, bcp47Id: string, offsetSeconds: number, dst: boolean); diff --git a/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.mjs b/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.mjs index 7c3ef0247cc..2df79ae8b26 100644 --- a/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/ZonedDateTimeFormatter.mjs @@ -5,8 +5,7 @@ import { IsoDateTime } from "icu4x" import { Locale } from "icu4x" import { TimeZoneInfo } from "icu4x" import { ZonedDateTimeFormatter } from "icu4x" -export function formatDatetimeWithCustomTimeZone() { - var terminusArgs = arguments; +export function formatDatetimeWithCustomTimeZone(name, length, year, month, day, hour, minute, second, nanosecond, name_1, bcp47Id, offsetSeconds, dst) { return (function (...args) { return args[0].formatDatetimeWithCustomTimeZone(...args.slice(1)) }).apply( null, [ @@ -21,22 +20,22 @@ export function formatDatetimeWithCustomTimeZone() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), DateTime.fromIsoInCalendar.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8], + year, + month, + day, + hour, + minute, + second, + nanosecond, Calendar.createForLocale.apply( null, [ @@ -48,7 +47,7 @@ export function formatDatetimeWithCustomTimeZone() { Locale.fromString.apply( null, [ - terminusArgs[9] + name_1 ] ) ] @@ -58,16 +57,15 @@ export function formatDatetimeWithCustomTimeZone() { TimeZoneInfo.fromParts.apply( null, [ - terminusArgs[10], - terminusArgs[11], - terminusArgs[12] + bcp47Id, + offsetSeconds, + dst ] ) ] ); } -export function formatIsoDatetimeWithCustomTimeZone() { - var terminusArgs = arguments; +export function formatIsoDatetimeWithCustomTimeZone(name, length, year, month, day, hour, minute, second, nanosecond, bcp47Id, offsetSeconds, dst) { return (function (...args) { return args[0].formatIsoDatetimeWithCustomTimeZone(...args.slice(1)) }).apply( null, [ @@ -82,30 +80,30 @@ export function formatIsoDatetimeWithCustomTimeZone() { Locale.fromString.apply( null, [ - terminusArgs[0] + name ] ), - terminusArgs[1] + length ] ), IsoDateTime.create.apply( null, [ - terminusArgs[2], - terminusArgs[3], - terminusArgs[4], - terminusArgs[5], - terminusArgs[6], - terminusArgs[7], - terminusArgs[8] + year, + month, + day, + hour, + minute, + second, + nanosecond ] ), TimeZoneInfo.fromParts.apply( null, [ - terminusArgs[9], - terminusArgs[10], - terminusArgs[11] + bcp47Id, + offsetSeconds, + dst ] ) ] diff --git a/ffi/capi/bindings/demo_gen/index.mjs b/ffi/capi/bindings/demo_gen/index.mjs index bcf46a5301b..209e8a028da 100644 --- a/ffi/capi/bindings/demo_gen/index.mjs +++ b/ffi/capi/bindings/demo_gen/index.mjs @@ -209,7 +209,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Self:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -242,7 +242,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Self:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -299,7 +299,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Self:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -356,7 +356,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Self:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -371,7 +371,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -401,7 +401,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Value:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -416,7 +416,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -455,7 +455,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -509,7 +509,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Value:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -524,7 +524,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -587,7 +587,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -641,7 +641,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Value:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -656,7 +656,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -719,7 +719,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -758,7 +758,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -821,7 +821,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -884,7 +884,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -929,7 +929,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -983,7 +983,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Value:Calendar:Locale:Name", type: "string", typeUse: "string" } @@ -998,7 +998,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -1061,7 +1061,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -1115,7 +1115,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -1400,7 +1400,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -1481,7 +1481,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, @@ -1535,7 +1535,7 @@ let termini = Object.assign({ }, { - name: "Locale:Name", + name: "Datetime:Calendar:Locale:Name", type: "string", typeUse: "string" }, @@ -1568,7 +1568,7 @@ let termini = Object.assign({ parameters: [ { - name: "Locale:Name", + name: "Self:Locale:Name", type: "string", typeUse: "string" }, diff --git a/ffi/capi/bindings/js/CanonicalDecomposition.mjs b/ffi/capi/bindings/js/CanonicalDecomposition.mjs index 5a9e4d8ea7e..58581452e07 100644 --- a/ffi/capi/bindings/js/CanonicalDecomposition.mjs +++ b/ffi/capi/bindings/js/CanonicalDecomposition.mjs @@ -67,7 +67,7 @@ export class CanonicalDecomposition { const result = wasm.icu4x_CanonicalDecomposition_decompose_mv1(diplomatReceive.buffer, this.ffiValue, c); try { - return new Decomposed(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return Decomposed._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/CodePointRangeIterator.mjs b/ffi/capi/bindings/js/CodePointRangeIterator.mjs index 0866b129161..6922c4079ee 100644 --- a/ffi/capi/bindings/js/CodePointRangeIterator.mjs +++ b/ffi/capi/bindings/js/CodePointRangeIterator.mjs @@ -48,7 +48,7 @@ export class CodePointRangeIterator { const result = wasm.icu4x_CodePointRangeIterator_next_mv1(diplomatReceive.buffer, this.ffiValue); try { - return new CodePointRangeIteratorResult(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return CodePointRangeIteratorResult._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/CodePointRangeIteratorResult.mjs b/ffi/capi/bindings/js/CodePointRangeIteratorResult.mjs index 95555e188f9..ea030a8b22d 100644 --- a/ffi/capi/bindings/js/CodePointRangeIteratorResult.mjs +++ b/ffi/capi/bindings/js/CodePointRangeIteratorResult.mjs @@ -30,12 +30,32 @@ export class CodePointRangeIteratorResult { return this.#done; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj, internalConstructor) { + if (typeof structObj !== "object") { + throw new Error("CodePointRangeIteratorResult's constructor takes an object of CodePointRangeIteratorResult's fields."); + } + + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("CodePointRangeIteratorResult is an out struct and can only be created internally."); + } + if ("start" in structObj) { + this.#start = structObj.start; + } else { + throw new Error("Missing required field start."); + } + + if ("end" in structObj) { + this.#end = structObj.end; } else { - console.error("CodePointRangeIteratorResult is an out struct and can only be created internally."); + throw new Error("Missing required field end."); } + + if ("done" in structObj) { + this.#done = structObj.done; + } else { + throw new Error("Missing required field done."); + } + } // Return this struct in FFI function friendly format. @@ -64,12 +84,18 @@ export class CodePointRangeIteratorResult { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("CodePointRangeIteratorResult._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const startDeref = (new Uint32Array(wasm.memory.buffer, ptr, 1))[0]; - this.#start = startDeref; + structObj.start = startDeref; const endDeref = (new Uint32Array(wasm.memory.buffer, ptr + 4, 1))[0]; - this.#end = endDeref; + structObj.end = endDeref; const doneDeref = (new Uint8Array(wasm.memory.buffer, ptr + 8, 1))[0] === 1; - this.#done = doneDeref; + structObj.done = doneDeref; + + return new CodePointRangeIteratorResult(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/Collator.mjs b/ffi/capi/bindings/js/Collator.mjs index c5e8cfa8b9c..1721874b1a9 100644 --- a/ffi/capi/bindings/js/Collator.mjs +++ b/ffi/capi/bindings/js/Collator.mjs @@ -87,7 +87,7 @@ export class Collator { const result = wasm.icu4x_Collator_resolved_options_v1_mv1(diplomatReceive.buffer, this.ffiValue); try { - return new CollatorResolvedOptions(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return CollatorResolvedOptions._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/CollatorOptions.d.ts b/ffi/capi/bindings/js/CollatorOptions.d.ts index f7336f64cdc..d53b58c7637 100644 --- a/ffi/capi/bindings/js/CollatorOptions.d.ts +++ b/ffi/capi/bindings/js/CollatorOptions.d.ts @@ -11,6 +11,16 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** See the [Rust documentation for `CollatorOptions`](https://docs.rs/icu/latest/icu/collator/struct.CollatorOptions.html) for more information. */ +type CollatorOptions_Obj = { + strength: CollatorStrength | null; + alternateHandling: CollatorAlternateHandling | null; + caseFirst: CollatorCaseFirst | null; + maxVariable: CollatorMaxVariable | null; + caseLevel: CollatorCaseLevel | null; + numeric: CollatorNumeric | null; + backwardSecondLevel: CollatorBackwardSecondLevel | null; +}; + export class CollatorOptions { get strength() : CollatorStrength | null; @@ -33,5 +43,5 @@ export class CollatorOptions { get backwardSecondLevel() : CollatorBackwardSecondLevel | null; set backwardSecondLevel(value: CollatorBackwardSecondLevel | null); - constructor(strength: CollatorStrength | null, alternateHandling: CollatorAlternateHandling | null, caseFirst: CollatorCaseFirst | null, maxVariable: CollatorMaxVariable | null, caseLevel: CollatorCaseLevel | null, numeric: CollatorNumeric | null, backwardSecondLevel: CollatorBackwardSecondLevel | null); + constructor(structObj : CollatorOptions_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/CollatorOptions.mjs b/ffi/capi/bindings/js/CollatorOptions.mjs index 72b9c6b926c..7b31b6e7055 100644 --- a/ffi/capi/bindings/js/CollatorOptions.mjs +++ b/ffi/capi/bindings/js/CollatorOptions.mjs @@ -69,19 +69,53 @@ export class CollatorOptions { set backwardSecondLevel(value) { this.#backwardSecondLevel = value; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("CollatorOptions's constructor takes an object of CollatorOptions's fields."); + } + + if ("strength" in structObj) { + this.#strength = structObj.strength; + } else { + this.#strength = null; + } + + if ("alternateHandling" in structObj) { + this.#alternateHandling = structObj.alternateHandling; + } else { + this.#alternateHandling = null; + } + + if ("caseFirst" in structObj) { + this.#caseFirst = structObj.caseFirst; + } else { + this.#caseFirst = null; + } + + if ("maxVariable" in structObj) { + this.#maxVariable = structObj.maxVariable; } else { - - this.#strength = arguments[0]; - this.#alternateHandling = arguments[1]; - this.#caseFirst = arguments[2]; - this.#maxVariable = arguments[3]; - this.#caseLevel = arguments[4]; - this.#numeric = arguments[5]; - this.#backwardSecondLevel = arguments[6]; + this.#maxVariable = null; } + + if ("caseLevel" in structObj) { + this.#caseLevel = structObj.caseLevel; + } else { + this.#caseLevel = null; + } + + if ("numeric" in structObj) { + this.#numeric = structObj.numeric; + } else { + this.#numeric = null; + } + + if ("backwardSecondLevel" in structObj) { + this.#backwardSecondLevel = structObj.backwardSecondLevel; + } else { + this.#backwardSecondLevel = null; + } + } // Return this struct in FFI function friendly format. @@ -114,20 +148,26 @@ export class CollatorOptions { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("CollatorOptions._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const strengthDeref = ptr; - this.#strength = diplomatRuntime.readOption(wasm, strengthDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorStrength(diplomatRuntime.internalConstructor, deref) }); + structObj.strength = diplomatRuntime.readOption(wasm, strengthDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorStrength(diplomatRuntime.internalConstructor, deref) }); const alternateHandlingDeref = ptr + 8; - this.#alternateHandling = diplomatRuntime.readOption(wasm, alternateHandlingDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorAlternateHandling(diplomatRuntime.internalConstructor, deref) }); + structObj.alternateHandling = diplomatRuntime.readOption(wasm, alternateHandlingDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorAlternateHandling(diplomatRuntime.internalConstructor, deref) }); const caseFirstDeref = ptr + 16; - this.#caseFirst = diplomatRuntime.readOption(wasm, caseFirstDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorCaseFirst(diplomatRuntime.internalConstructor, deref) }); + structObj.caseFirst = diplomatRuntime.readOption(wasm, caseFirstDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorCaseFirst(diplomatRuntime.internalConstructor, deref) }); const maxVariableDeref = ptr + 24; - this.#maxVariable = diplomatRuntime.readOption(wasm, maxVariableDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorMaxVariable(diplomatRuntime.internalConstructor, deref) }); + structObj.maxVariable = diplomatRuntime.readOption(wasm, maxVariableDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorMaxVariable(diplomatRuntime.internalConstructor, deref) }); const caseLevelDeref = ptr + 32; - this.#caseLevel = diplomatRuntime.readOption(wasm, caseLevelDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorCaseLevel(diplomatRuntime.internalConstructor, deref) }); + structObj.caseLevel = diplomatRuntime.readOption(wasm, caseLevelDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorCaseLevel(diplomatRuntime.internalConstructor, deref) }); const numericDeref = ptr + 40; - this.#numeric = diplomatRuntime.readOption(wasm, numericDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorNumeric(diplomatRuntime.internalConstructor, deref) }); + structObj.numeric = diplomatRuntime.readOption(wasm, numericDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorNumeric(diplomatRuntime.internalConstructor, deref) }); const backwardSecondLevelDeref = ptr + 48; - this.#backwardSecondLevel = diplomatRuntime.readOption(wasm, backwardSecondLevelDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorBackwardSecondLevel(diplomatRuntime.internalConstructor, deref) }); + structObj.backwardSecondLevel = diplomatRuntime.readOption(wasm, backwardSecondLevelDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new CollatorBackwardSecondLevel(diplomatRuntime.internalConstructor, deref) }); + + return new CollatorOptions(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/CollatorResolvedOptions.mjs b/ffi/capi/bindings/js/CollatorResolvedOptions.mjs index 8300d504f73..735a2e55cd2 100644 --- a/ffi/capi/bindings/js/CollatorResolvedOptions.mjs +++ b/ffi/capi/bindings/js/CollatorResolvedOptions.mjs @@ -55,12 +55,56 @@ export class CollatorResolvedOptions { return this.#backwardSecondLevel; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj, internalConstructor) { + if (typeof structObj !== "object") { + throw new Error("CollatorResolvedOptions's constructor takes an object of CollatorResolvedOptions's fields."); + } + + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("CollatorResolvedOptions is an out struct and can only be created internally."); + } + if ("strength" in structObj) { + this.#strength = structObj.strength; + } else { + throw new Error("Missing required field strength."); + } + + if ("alternateHandling" in structObj) { + this.#alternateHandling = structObj.alternateHandling; + } else { + throw new Error("Missing required field alternateHandling."); + } + + if ("caseFirst" in structObj) { + this.#caseFirst = structObj.caseFirst; + } else { + throw new Error("Missing required field caseFirst."); + } + + if ("maxVariable" in structObj) { + this.#maxVariable = structObj.maxVariable; } else { - console.error("CollatorResolvedOptions is an out struct and can only be created internally."); + throw new Error("Missing required field maxVariable."); } + + if ("caseLevel" in structObj) { + this.#caseLevel = structObj.caseLevel; + } else { + throw new Error("Missing required field caseLevel."); + } + + if ("numeric" in structObj) { + this.#numeric = structObj.numeric; + } else { + throw new Error("Missing required field numeric."); + } + + if ("backwardSecondLevel" in structObj) { + this.#backwardSecondLevel = structObj.backwardSecondLevel; + } else { + throw new Error("Missing required field backwardSecondLevel."); + } + } // Return this struct in FFI function friendly format. @@ -93,20 +137,26 @@ export class CollatorResolvedOptions { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("CollatorResolvedOptions._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const strengthDeref = diplomatRuntime.enumDiscriminant(wasm, ptr); - this.#strength = new CollatorStrength(diplomatRuntime.internalConstructor, strengthDeref); + structObj.strength = new CollatorStrength(diplomatRuntime.internalConstructor, strengthDeref); const alternateHandlingDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 4); - this.#alternateHandling = new CollatorAlternateHandling(diplomatRuntime.internalConstructor, alternateHandlingDeref); + structObj.alternateHandling = new CollatorAlternateHandling(diplomatRuntime.internalConstructor, alternateHandlingDeref); const caseFirstDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 8); - this.#caseFirst = new CollatorCaseFirst(diplomatRuntime.internalConstructor, caseFirstDeref); + structObj.caseFirst = new CollatorCaseFirst(diplomatRuntime.internalConstructor, caseFirstDeref); const maxVariableDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 12); - this.#maxVariable = new CollatorMaxVariable(diplomatRuntime.internalConstructor, maxVariableDeref); + structObj.maxVariable = new CollatorMaxVariable(diplomatRuntime.internalConstructor, maxVariableDeref); const caseLevelDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 16); - this.#caseLevel = new CollatorCaseLevel(diplomatRuntime.internalConstructor, caseLevelDeref); + structObj.caseLevel = new CollatorCaseLevel(diplomatRuntime.internalConstructor, caseLevelDeref); const numericDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 20); - this.#numeric = new CollatorNumeric(diplomatRuntime.internalConstructor, numericDeref); + structObj.numeric = new CollatorNumeric(diplomatRuntime.internalConstructor, numericDeref); const backwardSecondLevelDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 24); - this.#backwardSecondLevel = new CollatorBackwardSecondLevel(diplomatRuntime.internalConstructor, backwardSecondLevelDeref); + structObj.backwardSecondLevel = new CollatorBackwardSecondLevel(diplomatRuntime.internalConstructor, backwardSecondLevelDeref); + + return new CollatorResolvedOptions(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/Date.mjs b/ffi/capi/bindings/js/Date.mjs index 66008ca725c..a9c6c0a48f4 100644 --- a/ffi/capi/bindings/js/Date.mjs +++ b/ffi/capi/bindings/js/Date.mjs @@ -179,7 +179,7 @@ export class Date { const result = wasm.icu4x_Date_week_of_year_mv1(diplomatReceive.buffer, this.ffiValue, calculator.ffiValue); try { - return new WeekOf(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return WeekOf._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/DateTime.mjs b/ffi/capi/bindings/js/DateTime.mjs index 6d76766b4f9..fdcad9ab919 100644 --- a/ffi/capi/bindings/js/DateTime.mjs +++ b/ffi/capi/bindings/js/DateTime.mjs @@ -251,7 +251,7 @@ export class DateTime { const result = wasm.icu4x_DateTime_week_of_year_mv1(diplomatReceive.buffer, this.ffiValue, calculator.ffiValue); try { - return new WeekOf(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return WeekOf._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/Decomposed.mjs b/ffi/capi/bindings/js/Decomposed.mjs index c156271ceb0..c86653db723 100644 --- a/ffi/capi/bindings/js/Decomposed.mjs +++ b/ffi/capi/bindings/js/Decomposed.mjs @@ -22,12 +22,26 @@ export class Decomposed { return this.#second; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj, internalConstructor) { + if (typeof structObj !== "object") { + throw new Error("Decomposed's constructor takes an object of Decomposed's fields."); + } + + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("Decomposed is an out struct and can only be created internally."); + } + if ("first" in structObj) { + this.#first = structObj.first; } else { - console.error("Decomposed is an out struct and can only be created internally."); + throw new Error("Missing required field first."); } + + if ("second" in structObj) { + this.#second = structObj.second; + } else { + throw new Error("Missing required field second."); + } + } // Return this struct in FFI function friendly format. @@ -55,10 +69,16 @@ export class Decomposed { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("Decomposed._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const firstDeref = (new Uint32Array(wasm.memory.buffer, ptr, 1))[0]; - this.#first = firstDeref; + structObj.first = firstDeref; const secondDeref = (new Uint32Array(wasm.memory.buffer, ptr + 4, 1))[0]; - this.#second = secondDeref; + structObj.second = secondDeref; + + return new Decomposed(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/DisplayNamesOptions.d.ts b/ffi/capi/bindings/js/DisplayNamesOptions.d.ts index 947a697e38e..47a6dcd705c 100644 --- a/ffi/capi/bindings/js/DisplayNamesOptions.d.ts +++ b/ffi/capi/bindings/js/DisplayNamesOptions.d.ts @@ -7,6 +7,12 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** See the [Rust documentation for `DisplayNamesOptions`](https://docs.rs/icu/latest/icu/displaynames/options/struct.DisplayNamesOptions.html) for more information. */ +type DisplayNamesOptions_Obj = { + style: DisplayNamesStyle | null; + fallback: DisplayNamesFallback | null; + languageDisplay: LanguageDisplay | null; +}; + export class DisplayNamesOptions { get style() : DisplayNamesStyle | null; @@ -17,5 +23,5 @@ export class DisplayNamesOptions { get languageDisplay() : LanguageDisplay | null; set languageDisplay(value: LanguageDisplay | null); - constructor(style: DisplayNamesStyle | null, fallback: DisplayNamesFallback | null, languageDisplay: LanguageDisplay | null); + constructor(structObj : DisplayNamesOptions_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/DisplayNamesOptions.mjs b/ffi/capi/bindings/js/DisplayNamesOptions.mjs index c7f40716a22..bae2aaecd62 100644 --- a/ffi/capi/bindings/js/DisplayNamesOptions.mjs +++ b/ffi/capi/bindings/js/DisplayNamesOptions.mjs @@ -33,15 +33,29 @@ export class DisplayNamesOptions { set languageDisplay(value) { this.#languageDisplay = value; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("DisplayNamesOptions's constructor takes an object of DisplayNamesOptions's fields."); + } + + if ("style" in structObj) { + this.#style = structObj.style; + } else { + this.#style = null; + } + + if ("fallback" in structObj) { + this.#fallback = structObj.fallback; } else { - - this.#style = arguments[0]; - this.#fallback = arguments[1]; - this.#languageDisplay = arguments[2]; + this.#fallback = null; } + + if ("languageDisplay" in structObj) { + this.#languageDisplay = structObj.languageDisplay; + } else { + this.#languageDisplay = null; + } + } // Return this struct in FFI function friendly format. @@ -70,12 +84,18 @@ export class DisplayNamesOptions { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("DisplayNamesOptions._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const styleDeref = ptr; - this.#style = diplomatRuntime.readOption(wasm, styleDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new DisplayNamesStyle(diplomatRuntime.internalConstructor, deref) }); + structObj.style = diplomatRuntime.readOption(wasm, styleDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new DisplayNamesStyle(diplomatRuntime.internalConstructor, deref) }); const fallbackDeref = ptr + 8; - this.#fallback = diplomatRuntime.readOption(wasm, fallbackDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new DisplayNamesFallback(diplomatRuntime.internalConstructor, deref) }); + structObj.fallback = diplomatRuntime.readOption(wasm, fallbackDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new DisplayNamesFallback(diplomatRuntime.internalConstructor, deref) }); const languageDisplayDeref = ptr + 16; - this.#languageDisplay = diplomatRuntime.readOption(wasm, languageDisplayDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LanguageDisplay(diplomatRuntime.internalConstructor, deref) }); + structObj.languageDisplay = diplomatRuntime.readOption(wasm, languageDisplayDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LanguageDisplay(diplomatRuntime.internalConstructor, deref) }); + + return new DisplayNamesOptions(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/FixedDecimal.mjs b/ffi/capi/bindings/js/FixedDecimal.mjs index 22a01c6a848..5f47ec21019 100644 --- a/ffi/capi/bindings/js/FixedDecimal.mjs +++ b/ffi/capi/bindings/js/FixedDecimal.mjs @@ -69,7 +69,7 @@ export class FixedDecimal { try { if (!diplomatReceive.resultFlag) { - const cause = new FixedDecimalLimitError(diplomatRuntime.internalConstructor); + const cause = new FixedDecimalLimitError({}, diplomatRuntime.internalConstructor); throw new globalThis.Error('FixedDecimalLimitError', { cause }); } return new FixedDecimal(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); @@ -87,7 +87,7 @@ export class FixedDecimal { try { if (!diplomatReceive.resultFlag) { - const cause = new FixedDecimalLimitError(diplomatRuntime.internalConstructor); + const cause = new FixedDecimalLimitError({}, diplomatRuntime.internalConstructor); throw new globalThis.Error('FixedDecimalLimitError', { cause }); } return new FixedDecimal(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); @@ -105,7 +105,7 @@ export class FixedDecimal { try { if (!diplomatReceive.resultFlag) { - const cause = new FixedDecimalLimitError(diplomatRuntime.internalConstructor); + const cause = new FixedDecimalLimitError({}, diplomatRuntime.internalConstructor); throw new globalThis.Error('FixedDecimalLimitError', { cause }); } return new FixedDecimal(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); diff --git a/ffi/capi/bindings/js/FixedDecimalLimitError.d.ts b/ffi/capi/bindings/js/FixedDecimalLimitError.d.ts index b8e1af31797..c94ed7f48e7 100644 --- a/ffi/capi/bindings/js/FixedDecimalLimitError.d.ts +++ b/ffi/capi/bindings/js/FixedDecimalLimitError.d.ts @@ -4,6 +4,9 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** Additional information: [1](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.LimitError.html) */ +type FixedDecimalLimitError_Obj = { +}; + export class FixedDecimalLimitError { - constructor(); + constructor(structObj : FixedDecimalLimitError_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/FixedDecimalLimitError.mjs b/ffi/capi/bindings/js/FixedDecimalLimitError.mjs index b4632dfd276..1056a05b5e5 100644 --- a/ffi/capi/bindings/js/FixedDecimalLimitError.mjs +++ b/ffi/capi/bindings/js/FixedDecimalLimitError.mjs @@ -6,8 +6,11 @@ import * as diplomatRuntime from "./diplomat-runtime.mjs"; /** Additional information: [1](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.LimitError.html) */ export class FixedDecimalLimitError { - constructor() { - + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("FixedDecimalLimitError's constructor takes an object of FixedDecimalLimitError's fields."); + } + } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/IsoDate.mjs b/ffi/capi/bindings/js/IsoDate.mjs index abc69bfecac..91267d9ecb7 100644 --- a/ffi/capi/bindings/js/IsoDate.mjs +++ b/ffi/capi/bindings/js/IsoDate.mjs @@ -153,7 +153,7 @@ export class IsoDate { const result = wasm.icu4x_IsoDate_week_of_year_mv1(diplomatReceive.buffer, this.ffiValue, calculator.ffiValue); try { - return new WeekOf(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return WeekOf._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/IsoDateTime.mjs b/ffi/capi/bindings/js/IsoDateTime.mjs index 1b2d8161620..6797c4348fa 100644 --- a/ffi/capi/bindings/js/IsoDateTime.mjs +++ b/ffi/capi/bindings/js/IsoDateTime.mjs @@ -225,7 +225,7 @@ export class IsoDateTime { const result = wasm.icu4x_IsoDateTime_week_of_year_mv1(diplomatReceive.buffer, this.ffiValue, calculator.ffiValue); try { - return new WeekOf(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return WeekOf._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/LineBreakOptions.d.ts b/ffi/capi/bindings/js/LineBreakOptions.d.ts index d68a529d5f9..9ec39bc9c4f 100644 --- a/ffi/capi/bindings/js/LineBreakOptions.d.ts +++ b/ffi/capi/bindings/js/LineBreakOptions.d.ts @@ -6,6 +6,11 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** See the [Rust documentation for `LineBreakOptions`](https://docs.rs/icu/latest/icu/segmenter/struct.LineBreakOptions.html) for more information. */ +type LineBreakOptions_Obj = { + strictness: LineBreakStrictness | null; + wordOption: LineBreakWordOption | null; +}; + export class LineBreakOptions { get strictness() : LineBreakStrictness | null; @@ -13,5 +18,5 @@ export class LineBreakOptions { get wordOption() : LineBreakWordOption | null; set wordOption(value: LineBreakWordOption | null); - constructor(strictness: LineBreakStrictness | null, wordOption: LineBreakWordOption | null); + constructor(structObj : LineBreakOptions_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/LineBreakOptions.mjs b/ffi/capi/bindings/js/LineBreakOptions.mjs index 380f712642d..5876ecd23d5 100644 --- a/ffi/capi/bindings/js/LineBreakOptions.mjs +++ b/ffi/capi/bindings/js/LineBreakOptions.mjs @@ -24,14 +24,23 @@ export class LineBreakOptions { set wordOption(value) { this.#wordOption = value; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("LineBreakOptions's constructor takes an object of LineBreakOptions's fields."); + } + + if ("strictness" in structObj) { + this.#strictness = structObj.strictness; + } else { + this.#strictness = null; + } + + if ("wordOption" in structObj) { + this.#wordOption = structObj.wordOption; } else { - - this.#strictness = arguments[0]; - this.#wordOption = arguments[1]; + this.#wordOption = null; } + } // Return this struct in FFI function friendly format. @@ -59,10 +68,16 @@ export class LineBreakOptions { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("LineBreakOptions._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const strictnessDeref = ptr; - this.#strictness = diplomatRuntime.readOption(wasm, strictnessDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LineBreakStrictness(diplomatRuntime.internalConstructor, deref) }); + structObj.strictness = diplomatRuntime.readOption(wasm, strictnessDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LineBreakStrictness(diplomatRuntime.internalConstructor, deref) }); const wordOptionDeref = ptr + 8; - this.#wordOption = diplomatRuntime.readOption(wasm, wordOptionDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LineBreakWordOption(diplomatRuntime.internalConstructor, deref) }); + structObj.wordOption = diplomatRuntime.readOption(wasm, wordOptionDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LineBreakWordOption(diplomatRuntime.internalConstructor, deref) }); + + return new LineBreakOptions(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/LocaleFallbackConfig.d.ts b/ffi/capi/bindings/js/LocaleFallbackConfig.d.ts index 3f6a9edc774..6ea25b491c4 100644 --- a/ffi/capi/bindings/js/LocaleFallbackConfig.d.ts +++ b/ffi/capi/bindings/js/LocaleFallbackConfig.d.ts @@ -7,9 +7,13 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; * *See the [Rust documentation for `LocaleFallbackConfig`](https://docs.rs/icu/latest/icu/locale/fallback/struct.LocaleFallbackConfig.html) for more information. */ +type LocaleFallbackConfig_Obj = { + priority: LocaleFallbackPriority; +}; + export class LocaleFallbackConfig { get priority() : LocaleFallbackPriority; set priority(value: LocaleFallbackPriority); - constructor(priority: LocaleFallbackPriority); + constructor(structObj : LocaleFallbackConfig_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/LocaleFallbackConfig.mjs b/ffi/capi/bindings/js/LocaleFallbackConfig.mjs index a4404f7a2d6..8dcbc855fcc 100644 --- a/ffi/capi/bindings/js/LocaleFallbackConfig.mjs +++ b/ffi/capi/bindings/js/LocaleFallbackConfig.mjs @@ -17,13 +17,17 @@ export class LocaleFallbackConfig { set priority(value) { this.#priority = value; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("LocaleFallbackConfig's constructor takes an object of LocaleFallbackConfig's fields."); + } + + if ("priority" in structObj) { + this.#priority = structObj.priority; } else { - - this.#priority = arguments[0]; + throw new Error("Missing required field priority."); } + } // Return this struct in FFI function friendly format. @@ -50,8 +54,14 @@ export class LocaleFallbackConfig { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("LocaleFallbackConfig._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const priorityDeref = diplomatRuntime.enumDiscriminant(wasm, ptr); - this.#priority = new LocaleFallbackPriority(diplomatRuntime.internalConstructor, priorityDeref); + structObj.priority = new LocaleFallbackPriority(diplomatRuntime.internalConstructor, priorityDeref); + + return new LocaleFallbackConfig(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/PluralCategories.mjs b/ffi/capi/bindings/js/PluralCategories.mjs index 119279e1710..634b3aa950d 100644 --- a/ffi/capi/bindings/js/PluralCategories.mjs +++ b/ffi/capi/bindings/js/PluralCategories.mjs @@ -39,12 +39,50 @@ export class PluralCategories { return this.#other; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj, internalConstructor) { + if (typeof structObj !== "object") { + throw new Error("PluralCategories's constructor takes an object of PluralCategories's fields."); + } + + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("PluralCategories is an out struct and can only be created internally."); + } + if ("zero" in structObj) { + this.#zero = structObj.zero; + } else { + throw new Error("Missing required field zero."); + } + + if ("one" in structObj) { + this.#one = structObj.one; } else { - console.error("PluralCategories is an out struct and can only be created internally."); + throw new Error("Missing required field one."); } + + if ("two" in structObj) { + this.#two = structObj.two; + } else { + throw new Error("Missing required field two."); + } + + if ("few" in structObj) { + this.#few = structObj.few; + } else { + throw new Error("Missing required field few."); + } + + if ("many" in structObj) { + this.#many = structObj.many; + } else { + throw new Error("Missing required field many."); + } + + if ("other" in structObj) { + this.#other = structObj.other; + } else { + throw new Error("Missing required field other."); + } + } // Return this struct in FFI function friendly format. @@ -76,18 +114,24 @@ export class PluralCategories { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("PluralCategories._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const zeroDeref = (new Uint8Array(wasm.memory.buffer, ptr, 1))[0] === 1; - this.#zero = zeroDeref; + structObj.zero = zeroDeref; const oneDeref = (new Uint8Array(wasm.memory.buffer, ptr + 1, 1))[0] === 1; - this.#one = oneDeref; + structObj.one = oneDeref; const twoDeref = (new Uint8Array(wasm.memory.buffer, ptr + 2, 1))[0] === 1; - this.#two = twoDeref; + structObj.two = twoDeref; const fewDeref = (new Uint8Array(wasm.memory.buffer, ptr + 3, 1))[0] === 1; - this.#few = fewDeref; + structObj.few = fewDeref; const manyDeref = (new Uint8Array(wasm.memory.buffer, ptr + 4, 1))[0] === 1; - this.#many = manyDeref; + structObj.many = manyDeref; const otherDeref = (new Uint8Array(wasm.memory.buffer, ptr + 5, 1))[0] === 1; - this.#other = otherDeref; + structObj.other = otherDeref; + + return new PluralCategories(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/PluralRules.mjs b/ffi/capi/bindings/js/PluralRules.mjs index b8cbc3d5117..893dceb90d0 100644 --- a/ffi/capi/bindings/js/PluralRules.mjs +++ b/ffi/capi/bindings/js/PluralRules.mjs @@ -94,7 +94,7 @@ export class PluralRules { const result = wasm.icu4x_PluralRules_categories_mv1(diplomatReceive.buffer, this.ffiValue); try { - return new PluralCategories(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return PluralCategories._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/ReorderedIndexMap.mjs b/ffi/capi/bindings/js/ReorderedIndexMap.mjs index 7a4121264d4..7b5dcc84e0b 100644 --- a/ffi/capi/bindings/js/ReorderedIndexMap.mjs +++ b/ffi/capi/bindings/js/ReorderedIndexMap.mjs @@ -49,7 +49,7 @@ export class ReorderedIndexMap { const result = wasm.icu4x_ReorderedIndexMap_as_slice_mv1(diplomatReceive.buffer, this.ffiValue); try { - return new diplomatRuntime.DiplomatSlicePrimitive.getSlice(wasm, diplomatReceive.buffer, "u32", aEdges); + return Array.from(new diplomatRuntime.DiplomatSlicePrimitive(wasm, diplomatReceive.buffer, "u32", aEdges).getValue()); } finally { diff --git a/ffi/capi/bindings/js/TimeZoneInfo.mjs b/ffi/capi/bindings/js/TimeZoneInfo.mjs index 154036c3be7..46075fcbba0 100644 --- a/ffi/capi/bindings/js/TimeZoneInfo.mjs +++ b/ffi/capi/bindings/js/TimeZoneInfo.mjs @@ -80,7 +80,7 @@ export class TimeZoneInfo { try { if (result !== 1) { - const cause = new TimeZoneInvalidOffsetError(diplomatRuntime.internalConstructor); + const cause = new TimeZoneInvalidOffsetError({}, diplomatRuntime.internalConstructor); throw new globalThis.Error('TimeZoneInvalidOffsetError', { cause }); } @@ -105,7 +105,7 @@ export class TimeZoneInfo { try { if (result !== 1) { - const cause = new TimeZoneInvalidOffsetError(diplomatRuntime.internalConstructor); + const cause = new TimeZoneInvalidOffsetError({}, diplomatRuntime.internalConstructor); throw new globalThis.Error('TimeZoneInvalidOffsetError', { cause }); } diff --git a/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.d.ts b/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.d.ts index c925c02fbad..dc2e6e4d3c4 100644 --- a/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.d.ts +++ b/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.d.ts @@ -4,6 +4,9 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** Additional information: [1](https://docs.rs/icu/latest/icu/timezone/struct.InvalidOffsetError.html) */ +type TimeZoneInvalidOffsetError_Obj = { +}; + export class TimeZoneInvalidOffsetError { - constructor(); + constructor(structObj : TimeZoneInvalidOffsetError_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.mjs b/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.mjs index 219ef8c055e..498945e0c9e 100644 --- a/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.mjs +++ b/ffi/capi/bindings/js/TimeZoneInvalidOffsetError.mjs @@ -6,8 +6,11 @@ import * as diplomatRuntime from "./diplomat-runtime.mjs"; /** Additional information: [1](https://docs.rs/icu/latest/icu/timezone/struct.InvalidOffsetError.html) */ export class TimeZoneInvalidOffsetError { - constructor() { - + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("TimeZoneInvalidOffsetError's constructor takes an object of TimeZoneInvalidOffsetError's fields."); + } + } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/TitlecaseOptions.d.ts b/ffi/capi/bindings/js/TitlecaseOptions.d.ts index 4b709f386db..69ea454a8ef 100644 --- a/ffi/capi/bindings/js/TitlecaseOptions.d.ts +++ b/ffi/capi/bindings/js/TitlecaseOptions.d.ts @@ -6,6 +6,11 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** See the [Rust documentation for `TitlecaseOptions`](https://docs.rs/icu/latest/icu/casemap/titlecase/struct.TitlecaseOptions.html) for more information. */ +type TitlecaseOptions_Obj = { + leadingAdjustment: LeadingAdjustment | null; + trailingCase: TrailingCase | null; +}; + export class TitlecaseOptions { get leadingAdjustment() : LeadingAdjustment | null; @@ -13,7 +18,7 @@ export class TitlecaseOptions { get trailingCase() : TrailingCase | null; set trailingCase(value: TrailingCase | null); - constructor(leadingAdjustment: LeadingAdjustment | null, trailingCase: TrailingCase | null); + constructor(structObj : TitlecaseOptions_Obj); static defaultOptions(): TitlecaseOptions; } \ No newline at end of file diff --git a/ffi/capi/bindings/js/TitlecaseOptions.mjs b/ffi/capi/bindings/js/TitlecaseOptions.mjs index 32da78c1a02..4ef96f66e14 100644 --- a/ffi/capi/bindings/js/TitlecaseOptions.mjs +++ b/ffi/capi/bindings/js/TitlecaseOptions.mjs @@ -24,14 +24,23 @@ export class TitlecaseOptions { set trailingCase(value) { this.#trailingCase = value; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("TitlecaseOptions's constructor takes an object of TitlecaseOptions's fields."); + } + + if ("leadingAdjustment" in structObj) { + this.#leadingAdjustment = structObj.leadingAdjustment; + } else { + this.#leadingAdjustment = null; + } + + if ("trailingCase" in structObj) { + this.#trailingCase = structObj.trailingCase; } else { - - this.#leadingAdjustment = arguments[0]; - this.#trailingCase = arguments[1]; + this.#trailingCase = null; } + } // Return this struct in FFI function friendly format. @@ -59,11 +68,17 @@ export class TitlecaseOptions { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("TitlecaseOptions._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const leadingAdjustmentDeref = ptr; - this.#leadingAdjustment = diplomatRuntime.readOption(wasm, leadingAdjustmentDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LeadingAdjustment(diplomatRuntime.internalConstructor, deref) }); + structObj.leadingAdjustment = diplomatRuntime.readOption(wasm, leadingAdjustmentDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new LeadingAdjustment(diplomatRuntime.internalConstructor, deref) }); const trailingCaseDeref = ptr + 8; - this.#trailingCase = diplomatRuntime.readOption(wasm, trailingCaseDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new TrailingCase(diplomatRuntime.internalConstructor, deref) }); + structObj.trailingCase = diplomatRuntime.readOption(wasm, trailingCaseDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new TrailingCase(diplomatRuntime.internalConstructor, deref) }); + + return new TitlecaseOptions(structObj, internalConstructor); } static defaultOptions() { @@ -72,7 +87,7 @@ export class TitlecaseOptions { const result = wasm.icu4x_TitlecaseOptionsV1_default_mv1(diplomatReceive.buffer); try { - return new TitlecaseOptions(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return TitlecaseOptions._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/WeekCalculator.mjs b/ffi/capi/bindings/js/WeekCalculator.mjs index 3f94d3da073..11ddee002ee 100644 --- a/ffi/capi/bindings/js/WeekCalculator.mjs +++ b/ffi/capi/bindings/js/WeekCalculator.mjs @@ -97,7 +97,7 @@ export class WeekCalculator { const result = wasm.icu4x_WeekCalculator_weekend_mv1(diplomatReceive.buffer, this.ffiValue); try { - return new WeekendContainsDay(diplomatRuntime.internalConstructor, diplomatReceive.buffer); + return WeekendContainsDay._fromFFI(diplomatRuntime.internalConstructor, diplomatReceive.buffer); } finally { diff --git a/ffi/capi/bindings/js/WeekOf.mjs b/ffi/capi/bindings/js/WeekOf.mjs index cb6397cdde4..ff1d7918578 100644 --- a/ffi/capi/bindings/js/WeekOf.mjs +++ b/ffi/capi/bindings/js/WeekOf.mjs @@ -19,12 +19,26 @@ export class WeekOf { return this.#unit; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj, internalConstructor) { + if (typeof structObj !== "object") { + throw new Error("WeekOf's constructor takes an object of WeekOf's fields."); + } + + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("WeekOf is an out struct and can only be created internally."); + } + if ("week" in structObj) { + this.#week = structObj.week; } else { - console.error("WeekOf is an out struct and can only be created internally."); + throw new Error("Missing required field week."); } + + if ("unit" in structObj) { + this.#unit = structObj.unit; + } else { + throw new Error("Missing required field unit."); + } + } // Return this struct in FFI function friendly format. @@ -57,10 +71,16 @@ export class WeekOf { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("WeekOf._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const weekDeref = (new Uint8Array(wasm.memory.buffer, ptr, 1))[0]; - this.#week = weekDeref; + structObj.week = weekDeref; const unitDeref = diplomatRuntime.enumDiscriminant(wasm, ptr + 4); - this.#unit = new WeekRelativeUnit(diplomatRuntime.internalConstructor, unitDeref); + structObj.unit = new WeekRelativeUnit(diplomatRuntime.internalConstructor, unitDeref); + + return new WeekOf(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/WeekendContainsDay.d.ts b/ffi/capi/bindings/js/WeekendContainsDay.d.ts index d20469c3eb2..2c8608cdf1b 100644 --- a/ffi/capi/bindings/js/WeekendContainsDay.d.ts +++ b/ffi/capi/bindings/js/WeekendContainsDay.d.ts @@ -6,6 +6,16 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; * *See the [Rust documentation for `weekend`](https://docs.rs/icu/latest/icu/calendar/week/struct.WeekCalculator.html#method.weekend) for more information. */ +type WeekendContainsDay_Obj = { + monday: boolean; + tuesday: boolean; + wednesday: boolean; + thursday: boolean; + friday: boolean; + saturday: boolean; + sunday: boolean; +}; + export class WeekendContainsDay { get monday() : boolean; @@ -28,5 +38,5 @@ export class WeekendContainsDay { get sunday() : boolean; set sunday(value: boolean); - constructor(monday: boolean, tuesday: boolean, wednesday: boolean, thursday: boolean, friday: boolean, saturday: boolean, sunday: boolean); + constructor(structObj : WeekendContainsDay_Obj); } \ No newline at end of file diff --git a/ffi/capi/bindings/js/WeekendContainsDay.mjs b/ffi/capi/bindings/js/WeekendContainsDay.mjs index 2d84f2268ed..24090e6f34e 100644 --- a/ffi/capi/bindings/js/WeekendContainsDay.mjs +++ b/ffi/capi/bindings/js/WeekendContainsDay.mjs @@ -64,19 +64,53 @@ export class WeekendContainsDay { set sunday(value) { this.#sunday = value; } - constructor() { - if (arguments.length > 0 && arguments[0] === diplomatRuntime.internalConstructor) { - this.#fromFFI(...Array.prototype.slice.call(arguments, 1)); + constructor(structObj) { + if (typeof structObj !== "object") { + throw new Error("WeekendContainsDay's constructor takes an object of WeekendContainsDay's fields."); + } + + if ("monday" in structObj) { + this.#monday = structObj.monday; + } else { + throw new Error("Missing required field monday."); + } + + if ("tuesday" in structObj) { + this.#tuesday = structObj.tuesday; + } else { + throw new Error("Missing required field tuesday."); + } + + if ("wednesday" in structObj) { + this.#wednesday = structObj.wednesday; + } else { + throw new Error("Missing required field wednesday."); + } + + if ("thursday" in structObj) { + this.#thursday = structObj.thursday; } else { - - this.#monday = arguments[0]; - this.#tuesday = arguments[1]; - this.#wednesday = arguments[2]; - this.#thursday = arguments[3]; - this.#friday = arguments[4]; - this.#saturday = arguments[5]; - this.#sunday = arguments[6]; + throw new Error("Missing required field thursday."); } + + if ("friday" in structObj) { + this.#friday = structObj.friday; + } else { + throw new Error("Missing required field friday."); + } + + if ("saturday" in structObj) { + this.#saturday = structObj.saturday; + } else { + throw new Error("Missing required field saturday."); + } + + if ("sunday" in structObj) { + this.#sunday = structObj.sunday; + } else { + throw new Error("Missing required field sunday."); + } + } // Return this struct in FFI function friendly format. @@ -109,20 +143,26 @@ export class WeekendContainsDay { // and passes it down to individual fields containing the borrow. // This method does not attempt to handle any dependencies between lifetimes, the caller // should handle this when constructing edge arrays. - #fromFFI(ptr) { + static _fromFFI(internalConstructor, ptr) { + if (internalConstructor !== diplomatRuntime.internalConstructor) { + throw new Error("WeekendContainsDay._fromFFI is not meant to be called externally. Please use the default constructor."); + } + var structObj = {}; const mondayDeref = (new Uint8Array(wasm.memory.buffer, ptr, 1))[0] === 1; - this.#monday = mondayDeref; + structObj.monday = mondayDeref; const tuesdayDeref = (new Uint8Array(wasm.memory.buffer, ptr + 1, 1))[0] === 1; - this.#tuesday = tuesdayDeref; + structObj.tuesday = tuesdayDeref; const wednesdayDeref = (new Uint8Array(wasm.memory.buffer, ptr + 2, 1))[0] === 1; - this.#wednesday = wednesdayDeref; + structObj.wednesday = wednesdayDeref; const thursdayDeref = (new Uint8Array(wasm.memory.buffer, ptr + 3, 1))[0] === 1; - this.#thursday = thursdayDeref; + structObj.thursday = thursdayDeref; const fridayDeref = (new Uint8Array(wasm.memory.buffer, ptr + 4, 1))[0] === 1; - this.#friday = fridayDeref; + structObj.friday = fridayDeref; const saturdayDeref = (new Uint8Array(wasm.memory.buffer, ptr + 5, 1))[0] === 1; - this.#saturday = saturdayDeref; + structObj.saturday = saturdayDeref; const sundayDeref = (new Uint8Array(wasm.memory.buffer, ptr + 6, 1))[0] === 1; - this.#sunday = sundayDeref; + structObj.sunday = sundayDeref; + + return new WeekendContainsDay(structObj, internalConstructor); } } \ No newline at end of file diff --git a/ffi/capi/bindings/js/diplomat-runtime.mjs b/ffi/capi/bindings/js/diplomat-runtime.mjs index 18846dfc0da..fc8d591f3cc 100644 --- a/ffi/capi/bindings/js/diplomat-runtime.mjs +++ b/ffi/capi/bindings/js/diplomat-runtime.mjs @@ -606,4 +606,4 @@ export class GarbageCollectorGrip { } } -const DiplomatBufferFinalizer = new FinalizationRegistry(free => free()); \ No newline at end of file +const DiplomatBufferFinalizer = new FinalizationRegistry(free => free()); diff --git a/tutorials/c-tiny/fixeddecimal/Cargo.lock b/tutorials/c-tiny/fixeddecimal/Cargo.lock index 69751d2bb26..5eb0bfa8d44 100644 --- a/tutorials/c-tiny/fixeddecimal/Cargo.lock +++ b/tutorials/c-tiny/fixeddecimal/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "diplomat" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "diplomat_core", "proc-macro2", @@ -16,26 +16,26 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" [[package]] name = "diplomat_core" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "proc-macro2", "quote", "serde", "smallvec", - "strck_ident", + "strck", "syn", ] [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -44,31 +44,46 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "diplomat", "diplomat-runtime", "icu_locale_core", "icu_provider", "icu_provider_adapters", + "potential_utf", "tinystr", "writeable", + "zerovec", +] + +[[package]] +name = "icu_collections" +version = "2.0.0-beta1" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", ] [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -79,7 +94,7 @@ dependencies = [ [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -94,7 +109,7 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider", @@ -104,7 +119,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -113,40 +128,49 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" + +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "writeable", + "zerovec", +] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -167,25 +191,18 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strck" -version = "0.1.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" - -[[package]] -name = "strck_ident" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +checksum = "42316e70da376f3d113a68d138a60d8a9883c604fe97942721ec2068dab13a9f" dependencies = [ - "strck", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -205,7 +222,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -213,9 +230,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unused" @@ -226,11 +243,11 @@ dependencies = [ [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -240,7 +257,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -250,14 +267,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -267,7 +284,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -276,7 +293,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -285,7 +302,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -293,31 +310,31 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" [[patch.unused]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -325,63 +342,59 @@ version = "0.0.0" [[patch.unused]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_collator_data" -version = "1.5.0" - -[[patch.unused]] -name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" [[patch.unused]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -389,92 +402,92 @@ version = "0.2.0" [[patch.unused]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" [[patch.unused]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" [[patch.unused]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" diff --git a/tutorials/c-tiny/fixeddecimal/Cargo.toml b/tutorials/c-tiny/fixeddecimal/Cargo.toml index 319d8311b6e..7ffaab6a889 100644 --- a/tutorials/c-tiny/fixeddecimal/Cargo.toml +++ b/tutorials/c-tiny/fixeddecimal/Cargo.toml @@ -12,4 +12,4 @@ rust-version = "1.71.1" path = "unused" [dependencies] -icu_capi = { version = "2.0.0-dev", default-features = false } +icu_capi = { version = "2.0.0-beta1", default-features = false } diff --git a/tutorials/c-tiny/segmenter/Cargo.lock b/tutorials/c-tiny/segmenter/Cargo.lock index 69751d2bb26..5eb0bfa8d44 100644 --- a/tutorials/c-tiny/segmenter/Cargo.lock +++ b/tutorials/c-tiny/segmenter/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "diplomat" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "diplomat_core", "proc-macro2", @@ -16,26 +16,26 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" [[package]] name = "diplomat_core" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "proc-macro2", "quote", "serde", "smallvec", - "strck_ident", + "strck", "syn", ] [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -44,31 +44,46 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "diplomat", "diplomat-runtime", "icu_locale_core", "icu_provider", "icu_provider_adapters", + "potential_utf", "tinystr", "writeable", + "zerovec", +] + +[[package]] +name = "icu_collections" +version = "2.0.0-beta1" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", ] [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -79,7 +94,7 @@ dependencies = [ [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -94,7 +109,7 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider", @@ -104,7 +119,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -113,40 +128,49 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" + +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "writeable", + "zerovec", +] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -167,25 +191,18 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strck" -version = "0.1.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" - -[[package]] -name = "strck_ident" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +checksum = "42316e70da376f3d113a68d138a60d8a9883c604fe97942721ec2068dab13a9f" dependencies = [ - "strck", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -205,7 +222,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -213,9 +230,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unused" @@ -226,11 +243,11 @@ dependencies = [ [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -240,7 +257,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -250,14 +267,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -267,7 +284,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -276,7 +293,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -285,7 +302,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -293,31 +310,31 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" [[patch.unused]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -325,63 +342,59 @@ version = "0.0.0" [[patch.unused]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_collator_data" -version = "1.5.0" - -[[patch.unused]] -name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" [[patch.unused]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -389,92 +402,92 @@ version = "0.2.0" [[patch.unused]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" [[patch.unused]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" [[patch.unused]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" diff --git a/tutorials/c-tiny/segmenter/Cargo.toml b/tutorials/c-tiny/segmenter/Cargo.toml index 61e3fcbb1b4..ee978321876 100644 --- a/tutorials/c-tiny/segmenter/Cargo.toml +++ b/tutorials/c-tiny/segmenter/Cargo.toml @@ -13,4 +13,4 @@ rust-version = "1.71.1" path = "unused" [dependencies] -icu_capi = { version = "2.0.0-dev", default-features = false } \ No newline at end of file +icu_capi = { version = "2.0.0-beta1", default-features = false } \ No newline at end of file diff --git a/tutorials/c/Cargo.lock b/tutorials/c/Cargo.lock index 1dbc0595c89..a174762bdf5 100644 --- a/tutorials/c/Cargo.lock +++ b/tutorials/c/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -47,7 +47,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fe5201dd04ee6614942f817b291e90cb01440c19#fe5201dd04ee6614942f817b291e90cb01440c19" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "diplomat_core", "proc-macro2", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fe5201dd04ee6614942f817b291e90cb01440c19#fe5201dd04ee6614942f817b291e90cb01440c19" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "log", ] @@ -66,21 +66,21 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fe5201dd04ee6614942f817b291e90cb01440c19#fe5201dd04ee6614942f817b291e90cb01440c19" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "proc-macro2", "quote", "serde", "smallvec", - "strck_ident", + "strck", "syn", ] [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -89,13 +89,13 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "ryu", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -120,7 +120,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "diplomat", "diplomat-runtime", @@ -156,11 +156,12 @@ dependencies = [ "tinystr", "unicode-bidi", "writeable", + "zerovec", ] [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -175,18 +176,19 @@ dependencies = [ [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -198,7 +200,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -206,9 +208,10 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -216,7 +219,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -225,9 +228,11 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", "icu_provider", "icu_timezone", + "litemap", "potential_utf", "smallvec", "tinystr", @@ -237,7 +242,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -245,18 +250,20 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -264,7 +271,7 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", "either", @@ -295,7 +302,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -303,7 +310,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -314,7 +321,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -322,9 +329,10 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_locale_data", "icu_provider", @@ -335,7 +343,7 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -346,14 +354,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -369,25 +377,25 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", "writeable", "yoke", - "zerofrom", + "zerovec", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -398,7 +406,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -406,7 +414,7 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -415,20 +423,20 @@ dependencies = [ "icu_provider", "potential_utf", "unicode-bidi", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -444,7 +452,7 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider", @@ -454,7 +462,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -463,7 +471,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -472,7 +480,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -487,7 +495,7 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -495,8 +503,9 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "displaydoc", "icu_calendar", "icu_provider", @@ -508,20 +517,20 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -529,37 +538,37 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -611,7 +620,7 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.0.0" +version = "0.1.0" dependencies = [ "serde", "writeable", @@ -626,27 +635,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "ryu" @@ -656,18 +665,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -700,25 +709,18 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strck" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" - -[[package]] -name = "strck_ident" -version = "0.1.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +checksum = "42316e70da376f3d113a68d138a60d8a9883c604fe97942721ec2068dab13a9f" dependencies = [ - "strck", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -771,7 +773,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -779,15 +781,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unused" @@ -882,14 +884,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -899,7 +901,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -909,14 +911,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -926,7 +928,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "yoke", @@ -935,7 +937,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -944,7 +946,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -953,7 +955,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -961,27 +963,27 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -989,11 +991,11 @@ version = "0.0.0" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -1001,24 +1003,24 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/c/Cargo.toml b/tutorials/c/Cargo.toml index fb1fe0c4139..a4fc36ce21e 100644 --- a/tutorials/c/Cargo.toml +++ b/tutorials/c/Cargo.toml @@ -9,4 +9,4 @@ name = "unused" path = "unused" [dependencies] -icu_capi = "2.0.0-dev" +icu_capi = "2.0.0-beta1" diff --git a/tutorials/cpp.md b/tutorials/cpp.md index a7667d2ea20..3b0f5fab462 100644 --- a/tutorials/cpp.md +++ b/tutorials/cpp.md @@ -26,7 +26,7 @@ resolver = "2" path = "unused" [dependencies] -icu_capi = { version = "2.0.0-dev", default-features = false, features = [] } +icu_capi = { version = "2.0.0-beta1", default-features = false, features = [] } ``` Some of the keys are required by the parser, but won't be used by us. @@ -43,7 +43,7 @@ Some of the keys are required by the parser, but won't be used by us. You can now set features by updating the `features` key in `Cargo.toml`: ```toml -icu_capi = { version = "2.0.0-dev", default-features = false, features = ["default", "buffer_provider"] } +icu_capi = { version = "2.0.0-beta1", default-features = false, features = ["default", "buffer_provider"] } ``` @@ -120,7 +120,7 @@ C++ versions beyond C++17 are supported, as are other C++ compilers. Users wishing to use ICU4X on a `no_std` platform will need to provide an allocator and a panic hook in order to build a linkable library. The `icu_capi` crate can provide a looping panic handler, and a `malloc`-backed allocator, under the `looping_panic_handler` and `libc_alloc` features, respectively. ```toml -icu_capi = { version = "2.0.0-dev", default-features = false, features = ["default_components", "buffer_provider", "looping_panic_handler", "libc_alloc"] } +icu_capi = { version = "2.0.0-beta1", default-features = false, features = ["default_components", "buffer_provider", "looping_panic_handler", "libc_alloc"] } ``` diff --git a/tutorials/cpp/Cargo.lock b/tutorials/cpp/Cargo.lock index 57bba4d32b4..a308b90cb5b 100644 --- a/tutorials/cpp/Cargo.lock +++ b/tutorials/cpp/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -105,9 +105,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "ryu", @@ -117,7 +123,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -133,7 +139,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -141,7 +147,7 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "diplomat", "diplomat-runtime", @@ -172,11 +178,12 @@ dependencies = [ "tinystr", "unicode-bidi", "writeable", + "zerovec", ] [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -192,18 +199,19 @@ dependencies = [ [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -216,7 +224,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -224,7 +232,7 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "potential_utf", @@ -236,7 +244,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -260,7 +268,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -268,19 +276,21 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", "serde", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -288,7 +298,7 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", "either", @@ -320,7 +330,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -328,7 +338,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -340,7 +350,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -348,7 +358,7 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -363,7 +373,7 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -375,14 +385,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -399,14 +409,14 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", @@ -418,7 +428,7 @@ dependencies = [ [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -430,7 +440,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -438,7 +448,7 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -454,14 +464,14 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -480,7 +490,7 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider", @@ -491,7 +501,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -500,7 +510,7 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "postcard", @@ -512,7 +522,7 @@ dependencies = [ [[package]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_provider", @@ -522,7 +532,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -531,7 +541,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -547,7 +557,7 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -555,7 +565,7 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -570,20 +580,20 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -591,40 +601,46 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" dependencies = [ "serde", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -676,18 +692,19 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] [[package]] name = "potential_utf" -version = "0.0.0" +version = "0.1.0" dependencies = [ "serde", "writeable", @@ -702,27 +719,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "ryu" @@ -732,9 +749,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -751,9 +768,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -762,11 +779,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -809,9 +827,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -864,7 +882,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "serde", @@ -873,15 +891,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unused" @@ -977,14 +995,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -994,7 +1012,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -1004,14 +1022,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -1021,7 +1039,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "litemap", @@ -1033,7 +1051,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "serde", "yoke", @@ -1043,7 +1061,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -1052,7 +1070,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -1060,27 +1078,27 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -1088,11 +1106,11 @@ version = "0.0.0" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -1100,16 +1118,16 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/cpp/Cargo.toml b/tutorials/cpp/Cargo.toml index 469c4f5a508..6462a474c02 100644 --- a/tutorials/cpp/Cargo.toml +++ b/tutorials/cpp/Cargo.toml @@ -9,5 +9,5 @@ name = "unused" path = "unused" [dependencies] -icu_capi = { version = "2.0.0-dev", features = ["provider_fs", "experimental"] } -icu_provider = { version = "2.0.0-dev", features = ["deserialize_json"] } \ No newline at end of file +icu_capi = { version = "2.0.0-beta1", features = ["provider_fs", "experimental"] } +icu_provider = { version = "2.0.0-beta1", features = ["deserialize_json"] } \ No newline at end of file diff --git a/tutorials/gn/Cargo.toml b/tutorials/gn/Cargo.toml index 37454c7962c..04356a25116 100644 --- a/tutorials/gn/Cargo.toml +++ b/tutorials/gn/Cargo.toml @@ -10,9 +10,9 @@ edition = "2021" [dependencies] # Note: Only dependencies that are explicitly listed here are given public GN build targets. -icu_capi = { version = "2.0.0-dev", default-features = false, features = ["default_components"] } -icu = { version = "2.0.0-dev", default-features = false } -icu_provider = { version = "2.0.0-dev" } +icu_capi = { version = "2.0.0-beta1", default-features = false, features = ["default_components"] } +icu = { version = "2.0.0-beta1", default-features = false } +icu_provider = { version = "2.0.0-beta1" } # We need to explicitly specify versions here because these have build scripts and/or we wish to supply flags [gn.package.proc-macro2."1.0.91"] diff --git a/tutorials/js-tiny/Cargo.lock b/tutorials/js-tiny/Cargo.lock index ed327c2dc0d..a174762bdf5 100644 --- a/tutorials/js-tiny/Cargo.lock +++ b/tutorials/js-tiny/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -47,7 +47,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "diplomat_core", "proc-macro2", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "log", ] @@ -66,21 +66,21 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=8744ac97162341f347b63131969ad736e1047f6d#8744ac97162341f347b63131969ad736e1047f6d" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "proc-macro2", "quote", "serde", "smallvec", - "strck_ident", + "strck", "syn", ] [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -89,13 +89,13 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "ryu", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -120,7 +120,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "diplomat", "diplomat-runtime", @@ -151,15 +151,17 @@ dependencies = [ "icu_segmenter", "icu_timezone", "log", + "potential_utf", "simple_logger", "tinystr", "unicode-bidi", "writeable", + "zerovec", ] [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -167,24 +169,26 @@ dependencies = [ "icu_locale_core", "icu_properties", "icu_provider", + "potential_utf", "writeable", "zerovec", ] [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -196,7 +200,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -204,9 +208,10 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -214,7 +219,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -223,9 +228,12 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", "icu_provider", "icu_timezone", + "litemap", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -234,7 +242,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -242,18 +250,20 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -261,13 +271,15 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", + "either", "fixed_decimal", "icu_collections", "icu_decimal", "icu_experimental_data", + "icu_list", "icu_locale", "icu_locale_core", "icu_normalizer", @@ -279,6 +291,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -289,7 +302,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -297,7 +310,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -308,7 +321,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -316,19 +329,21 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_locale_data", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -339,14 +354,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -362,25 +377,25 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", "writeable", "yoke", - "zerofrom", + "zerovec", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -391,7 +406,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -399,28 +414,29 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", "unicode-bidi", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -436,7 +452,7 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider", @@ -446,7 +462,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -455,7 +471,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -464,7 +480,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -472,13 +488,14 @@ dependencies = [ "icu_locale_core", "icu_provider", "icu_segmenter_data", + "potential_utf", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -486,8 +503,9 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "displaydoc", "icu_calendar", "icu_provider", @@ -499,20 +517,20 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -520,37 +538,37 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -600,6 +618,15 @@ dependencies = [ "libc", ] +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "writeable", + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -608,27 +635,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "ryu" @@ -638,18 +665,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -682,25 +709,18 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strck" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" - -[[package]] -name = "strck_ident" -version = "0.1.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +checksum = "42316e70da376f3d113a68d138a60d8a9883c604fe97942721ec2068dab13a9f" dependencies = [ - "strck", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -753,7 +773,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -761,15 +781,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unused" @@ -864,14 +884,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -881,7 +901,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -891,14 +911,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -908,7 +928,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "yoke", @@ -917,7 +937,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -926,7 +946,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -935,7 +955,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -943,27 +963,27 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -971,11 +991,11 @@ version = "0.0.0" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -983,24 +1003,24 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/js-tiny/Cargo.toml b/tutorials/js-tiny/Cargo.toml index 60ab10fe559..317603da59e 100644 --- a/tutorials/js-tiny/Cargo.toml +++ b/tutorials/js-tiny/Cargo.toml @@ -13,4 +13,4 @@ rust-version = "1.71.1" path = "unused" [dependencies] -icu_capi = "2.0.0-dev" +icu_capi = "2.0.0-beta1" diff --git a/tutorials/rust.md b/tutorials/rust.md index 68e5f72892f..0c1d0e17507 100644 --- a/tutorials/rust.md +++ b/tutorials/rust.md @@ -8,7 +8,7 @@ The most basic Cargo.toml to get you off the ground is the following: ```toml [dependencies] -icu = "2.0.0-dev" +icu = "2.0.0-beta1" ``` In your main.rs, you can use all stable ICU4X components for the recommended set of locales, which get compiled into the library. @@ -33,7 +33,7 @@ Experimental modules are published in a separate `icu_experimental` crate: ```toml [dependencies] -icu = { version = "2.0.0-dev", features = ["experimental"] } +icu = { version = "2.0.0-beta1", features = ["experimental"] } ``` In your main.rs, you can now use e.g. the `icu_experimental::displaynames` module. @@ -46,8 +46,8 @@ If you wish to generate your own data in blob format and pass it into ICU4X, ena ```toml [dependencies] -icu = { version = "2.0.0-dev", features = ["serde"] } -icu_provider_blob = "2.0.0-dev" +icu = { version = "2.0.0-beta1", features = ["serde"] } +icu_provider_blob = "2.0.0-beta1" ``` To learn about building ICU4X data, including whether to check in the data blob file to your repository, see [data_management.md](./data_management.md). @@ -60,7 +60,7 @@ If you wish to share ICU4X objects between threads, you must enable the `"sync"` ```toml [dependencies] -icu = { version = "2.0.0-dev", features = ["sync"] } +icu = { version = "2.0.0-beta1", features = ["sync"] } ``` You can now use most ICU4X types when `Send + Sync` are required, such as when sharing across threads. @@ -73,16 +73,16 @@ If you wish to use data generation in a `build.rs` script, you need to manually ```toml [dependencies] -icu = { version = "2.0.0-dev", default-features = false } # turn off compiled_data -icu_provider = "2.0.0-dev" # for databake -icu_provider_baked = "2.0.0-dev" # for databake +icu = { version = "2.0.0-beta1", default-features = false } # turn off compiled_data +icu_provider = "2.0.0-beta1" # for databake +icu_provider_baked = "2.0.0-beta1" # for databake zerovec = "0.9" # for databake # for build.rs: [build-dependencies] -icu = "2.0.0-dev" -icu_provider_export = "2.0.0-dev" -icu_provider_source = "2.0.0-dev" +icu = "2.0.0-beta1" +icu_provider_export = "2.0.0-beta1" +icu_provider_source = "2.0.0-beta1" ``` This example has an additional section for auto-generating the data in build.rs. In your build.rs, invoke the ICU4X Datagen API with the set of markers you require. Don't worry; if using databake, you will get a compiler error if you don't specify enough markers. diff --git a/tutorials/rust/baked/Cargo.lock b/tutorials/rust/baked/Cargo.lock index ba7f5bf8043..c388ba5ca76 100644 --- a/tutorials/rust/baked/Cargo.lock +++ b/tutorials/rust/baked/Cargo.lock @@ -3,16 +3,25 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "base64" @@ -29,6 +38,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + [[package]] name = "bumpalo" version = "3.16.0" @@ -43,7 +58,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -51,9 +66,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -116,7 +134,7 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "databake" -version = "0.1.8" +version = "0.2.0" dependencies = [ "databake-derive", "proc-macro2", @@ -125,7 +143,7 @@ dependencies = [ [[package]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" dependencies = [ "proc-macro2", "quote", @@ -133,18 +151,11 @@ dependencies = [ "synstructure", ] -[[package]] -name = "deduplicating_array" -version = "0.1.6" -dependencies = [ - "serde", -] - [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -159,9 +170,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elsa" @@ -178,6 +189,18 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "erased-serde" version = "0.3.31" @@ -189,18 +212,18 @@ dependencies = [ [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "smallvec", - "writeable", + "writeable 0.6.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -226,6 +249,12 @@ dependencies = [ "wasi", ] +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + [[package]] name = "heck" version = "0.5.0" @@ -234,21 +263,22 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", "icu_collator", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_datetime", "icu_decimal", "icu_experimental", "icu_list", "icu_locale", - "icu_normalizer", + "icu_normalizer 2.0.0-beta1", + "icu_pattern", "icu_plurals", - "icu_properties", - "icu_provider", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "icu_provider_registry", "icu_segmenter", "icu_timezone", @@ -257,24 +287,24 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "databake", "displaydoc", "icu_calendar_data", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "ixdtf", "serde", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -282,58 +312,60 @@ dependencies = [ [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "icu_casemap_data", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", - "icu_properties", - "icu_provider", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", + "potential_utf", "serde", - "writeable", - "zerovec", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" dependencies = [ - "icu_collections", + "icu_collections 2.0.0-beta1", "wasmi", "wat", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "icu_collator_data", - "icu_collections", - "icu_normalizer", - "icu_properties", - "icu_provider", + "icu_collections 2.0.0-beta1", + "icu_locale_core", + "icu_normalizer 2.0.0-beta1", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "serde", "smallvec", "utf16_iter", "utf8_iter", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -342,18 +374,31 @@ dependencies = [ [[package]] name = "icu_collections" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_collections" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", + "potential_utf", "serde", "yoke", "zerofrom", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", @@ -363,20 +408,22 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_timezone", "litemap", + "potential_utf", "serde", "smallvec", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -384,20 +431,22 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "fixed_decimal", "icu_decimal_data", - "icu_provider", + "icu_provider 2.0.0-beta1", "serde", - "writeable", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -405,38 +454,41 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "databake", "displaydoc", + "either", "fixed_decimal", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_decimal", "icu_experimental_data", + "icu_list", "icu_locale", "icu_locale_core", - "icu_normalizer", + "icu_normalizer 2.0.0-beta1", "icu_pattern", "icu_plurals", - "icu_properties", - "icu_provider", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "litemap", "log", "num-bigint", "num-rational", "num-traits", + "potential_utf", "serde", "smallvec", - "tinystr", - "writeable", + "tinystr 0.8.0", + "writeable 0.6.0", "zerofrom", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -444,21 +496,20 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", - "deduplicating_array", "displaydoc", "icu_list_data", - "icu_provider", + "icu_provider 2.0.0-beta1", "regex-automata", "serde", - "writeable", + "writeable 0.6.0", ] [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -466,92 +517,151 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", + "icu_collections 2.0.0-beta1", "icu_locale_core", "icu_locale_data", - "icu_provider", + "icu_provider 2.0.0-beta1", + "potential_utf", "serde", - "tinystr", - "zerovec", + "tinystr 0.8.0", + "zerovec 0.11.0", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "litemap", "serde", - "tinystr", - "writeable", - "zerovec", + "tinystr 0.8.0", + "writeable 0.6.0", + "zerovec 0.11.0", ] [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr 0.7.6", + "writeable 0.5.5", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider 1.5.0", + "tinystr 0.7.6", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + [[package]] name = "icu_normalizer" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections 1.5.0", + "icu_normalizer_data 1.5.0", + "icu_properties 1.5.1", + "icu_provider 1.5.0", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", + "icu_collections 2.0.0-beta1", + "icu_normalizer_data 2.0.0-beta1", + "icu_properties 2.0.0-beta1", + "icu_provider 2.0.0-beta1", "serde", "smallvec", "utf16_iter", "utf8_iter", "write16", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_normalizer_data" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "databake", "displaydoc", "either", "serde", - "writeable", + "writeable 0.6.0", "yoke", - "zerofrom", + "zerovec 0.11.0", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", "fixed_decimal", "icu_plurals_data", - "icu_provider", + "icu_provider 2.0.0-beta1", "serde", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -559,109 +669,148 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections 1.5.0", + "icu_locid_transform", + "icu_properties_data 1.5.0", + "icu_provider 1.5.0", + "tinystr 0.7.6", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_properties" +version = "2.0.0-beta1" dependencies = [ "databake", "displaydoc", - "icu_collections", - "icu_properties_data", - "icu_provider", + "icu_collections 2.0.0-beta1", + "icu_locale_core", + "icu_properties_data 2.0.0-beta1", + "icu_provider 2.0.0-beta1", + "potential_utf", "serde", - "tinystr", - "zerovec", + "zerotrie", + "zerovec 0.11.0", ] [[package]] name = "icu_properties_data" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_properties_data" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros 1.5.0", + "stable_deref_trait", + "tinystr 0.7.6", + "writeable 0.5.5", + "yoke", + "zerofrom", + "zerovec 0.10.4", +] + +[[package]] +name = "icu_provider" +version = "2.0.0-beta1" dependencies = [ "bincode", "databake", "displaydoc", "erased-serde", "icu_locale_core", - "icu_provider_macros", + "icu_provider_macros 2.0.0-beta1", "log", "postcard", "serde", "serde_json", "stable_deref_trait", - "tinystr", - "writeable", + "tinystr 0.8.0", + "writeable 0.6.0", "yoke", "zerofrom", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", - "icu_provider", - "tinystr", - "zerovec", + "icu_provider 2.0.0-beta1", + "tinystr 0.8.0", + "zerovec 0.11.0", ] [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "crlify", "databake", "heck", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_registry", "log", "proc-macro2", - "writeable", + "writeable 0.6.0", "zerotrie", ] [[package]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_provider", + "icu_provider 2.0.0-beta1", "log", "postcard", "serde", - "writeable", + "writeable 0.6.0", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_baked", "icu_provider_blob", "icu_provider_fs", "log", "rayon", - "writeable", + "writeable 0.6.0", ] [[package]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "bincode", "crlify", "displaydoc", - "icu_provider", + "icu_provider 2.0.0-beta1", "log", "postcard", "serde", @@ -672,6 +821,17 @@ dependencies = [ [[package]] name = "icu_provider_macros" version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "icu_provider_macros" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -680,11 +840,11 @@ dependencies = [ [[package]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[package]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -692,47 +852,50 @@ dependencies = [ "elsa", "icu", "icu_codepointtrie_builder", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_pattern", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_adapters", "icu_provider_registry", "itertools", "litemap", "log", "ndarray", + "parse-zoneinfo", + "potential_utf", "serde", "serde-aux", "serde_json", - "tinystr", + "tinystr 0.8.0", "toml", "twox-hash", "ureq", - "writeable", + "writeable 0.6.0", "zerotrie", - "zerovec", + "zerovec 0.11.0", "zip", ] [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "databake", "displaydoc", - "icu_collections", + "icu_collections 2.0.0-beta1", "icu_locale_core", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_segmenter_data", + "potential_utf", "serde", "utf8_iter", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -740,34 +903,57 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "databake", "displaydoc", "icu_calendar", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_timezone_data", + "ixdtf", "serde", - "tinystr", + "tinystr 0.8.0", "zerotrie", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer 1.5.0", + "icu_properties 1.5.1", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", ] [[package]] @@ -787,13 +973,13 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -807,34 +993,34 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" dependencies = [ "serde", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -842,17 +1028,17 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -870,9 +1056,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -918,9 +1104,18 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] [[package]] name = "paste" @@ -936,29 +1131,39 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "serde", +] + +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "databake", "serde", + "zerovec 0.11.0", ] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -989,20 +1194,34 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" @@ -1021,11 +1240,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -1035,15 +1255,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -1058,9 +1278,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -1087,9 +1307,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -1098,15 +1318,22 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" version = "1.13.2" @@ -1136,15 +1363,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -1165,28 +1392,23 @@ dependencies = [ [[package]] name = "tinystr" version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "databake", "displaydoc", - "serde", - "zerovec", + "zerovec 0.10.4", ] [[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +name = "tinystr" +version = "0.8.0" dependencies = [ - "tinyvec_macros", + "databake", + "displaydoc", + "serde", + "zerovec 0.11.0", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" version = "0.5.11" @@ -1201,11 +1423,11 @@ name = "tutorial_baked" version = "0.0.0" dependencies = [ "icu", - "icu_provider", + "icu_provider 2.0.0-beta1", "icu_provider_baked", "icu_provider_export", "icu_provider_source", - "zerovec", + "zerovec 0.11.0", ] [[package]] @@ -1218,32 +1440,17 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "untrusted" @@ -1253,9 +1460,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64", "flate2", @@ -1263,16 +1470,15 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "url", "webpki-roots", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -1299,11 +1505,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-encoder" -version = "0.214.0" +version = "0.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff694f02a8d7a50b6922b197ae03883fbf18cdb2ae9fbee7b6148456f5f44041" +checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7" dependencies = [ "leb128", + "wasmparser", ] [[package]] @@ -1337,6 +1544,16 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmparser" +version = "0.220.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b" +dependencies = [ + "bitflags", + "indexmap", +] + [[package]] name = "wasmparser-nostd" version = "0.100.2" @@ -1348,9 +1565,9 @@ dependencies = [ [[package]] name = "wast" -version = "214.0.0" +version = "220.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694bcdb24c49c8709bd8713768b71301a11e823923eee355d530f1d8d0a7f8e9" +checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165" dependencies = [ "bumpalo", "leb128", @@ -1361,18 +1578,18 @@ dependencies = [ [[package]] name = "wat" -version = "1.214.0" +version = "1.220.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347249eb56773fa728df2656cfe3a8c19437ded61a922a0b5e0839d9790e278e" +checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3" dependencies = [ "wast", ] [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -1388,9 +1605,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1404,51 +1621,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "write16" @@ -1459,13 +1676,19 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "writeable" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -1475,7 +1698,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -1485,14 +1708,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -1508,7 +1731,7 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "databake", "displaydoc", @@ -1516,23 +1739,45 @@ dependencies = [ "serde", "yoke", "zerofrom", - "zerovec", + "zerovec 0.11.0", ] [[package]] name = "zerovec" version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive 0.10.3", +] + +[[package]] +name = "zerovec" +version = "0.11.0" dependencies = [ "databake", "serde", "yoke", "zerofrom", - "zerovec-derive", + "zerovec-derive 0.11.0", ] [[package]] name = "zerovec-derive" version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -1553,15 +1798,19 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" + +[[patch.unused]] +name = "deduplicating_array" +version = "0.1.7" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -1569,11 +1818,11 @@ version = "0.0.0" [[patch.unused]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -1581,4 +1830,4 @@ version = "0.2.0" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/rust/baked/Cargo.toml b/tutorials/rust/baked/Cargo.toml index 40653a287d2..a14c1cc2668 100644 --- a/tutorials/rust/baked/Cargo.toml +++ b/tutorials/rust/baked/Cargo.toml @@ -12,12 +12,12 @@ edition = "2021" publish = false [dependencies] -icu = { version = "2.0.0-dev", default-features = false } # turn off compiled_data -icu_provider = "2.0.0-dev" # for databake -icu_provider_baked = "2.0.0-dev" # for databake +icu = { version = "2.0.0-beta1", default-features = false } # turn off compiled_data +icu_provider = "2.0.0-beta1" # for databake +icu_provider_baked = "2.0.0-beta1" # for databake zerovec = "0.11.0-dev" # for databake [build-dependencies] -icu = "2.0.0-dev" -icu_provider_export = "2.0.0-dev" -icu_provider_source = "2.0.0-dev" +icu = "2.0.0-beta1" +icu_provider_export = "2.0.0-beta1" +icu_provider_source = "2.0.0-beta1" diff --git a/tutorials/rust/buffer/Cargo.lock b/tutorials/rust/buffer/Cargo.lock index 836f53f3576..1ad5ee42edc 100644 --- a/tutorials/rust/buffer/Cargo.lock +++ b/tutorials/rust/buffer/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -44,9 +44,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -54,9 +54,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "fixed_decimal" -version = "0.6.0-dev" +version = "0.6.0" dependencies = [ "displaydoc", "smallvec", @@ -65,7 +71,7 @@ dependencies = [ [[package]] name = "icu" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", @@ -87,7 +93,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -103,7 +109,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -111,7 +117,7 @@ dependencies = [ [[package]] name = "icu_casemap" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -127,14 +133,14 @@ dependencies = [ [[package]] name = "icu_casemap_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", @@ -152,7 +158,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -160,7 +166,7 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "potential_utf", @@ -172,7 +178,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -196,7 +202,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -204,20 +210,21 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", "serde", + "tinystr", "writeable", "zerovec", ] [[package]] name = "icu_decimal_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -225,7 +232,7 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.2.0-dev" +version = "0.2.0" dependencies = [ "displaydoc", "either", @@ -265,7 +272,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -277,7 +284,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -285,7 +292,7 @@ dependencies = [ [[package]] name = "icu_locale" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -300,7 +307,7 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -312,14 +319,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -336,14 +343,14 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.3.0-dev" +version = "0.3.0" dependencies = [ "displaydoc", "either", @@ -355,7 +362,7 @@ dependencies = [ [[package]] name = "icu_plurals" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -367,7 +374,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -375,7 +382,7 @@ dependencies = [ [[package]] name = "icu_properties" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -390,14 +397,14 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -414,7 +421,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -423,7 +430,7 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "postcard", @@ -435,7 +442,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -444,7 +451,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -460,7 +467,7 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -468,7 +475,7 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -484,14 +491,14 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "2.0.0-dev" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "ixdtf" -version = "0.3.0-dev" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -499,22 +506,22 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" dependencies = [ "serde", ] [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -551,18 +558,19 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] [[package]] name = "potential_utf" -version = "0.1.0-dev" +version = "0.1.0" dependencies = [ "serde", "zerovec", @@ -570,42 +578,42 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -629,9 +637,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -651,7 +659,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.0-dev" +version = "0.8.0" dependencies = [ "displaydoc", "serde", @@ -668,9 +676,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "utf16_iter" @@ -692,14 +700,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.6-dev" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.5-dev" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -709,7 +717,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -719,14 +727,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -736,7 +744,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.2.0-dev" +version = "0.2.0" dependencies = [ "displaydoc", "litemap", @@ -748,7 +756,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.0-dev" +version = "0.11.0" dependencies = [ "serde", "yoke", @@ -758,7 +766,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.0-dev" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -767,7 +775,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -775,19 +783,19 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.9-dev" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu4x-datagen" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" @@ -799,7 +807,7 @@ version = "0.0.0" [[patch.unused]] name = "icu_capi" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" @@ -807,7 +815,7 @@ version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -815,23 +823,23 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_adapters" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "2.0.0-dev" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" diff --git a/tutorials/rust/buffer/Cargo.toml b/tutorials/rust/buffer/Cargo.toml index c861d4aa31d..8244269ea60 100644 --- a/tutorials/rust/buffer/Cargo.toml +++ b/tutorials/rust/buffer/Cargo.toml @@ -12,5 +12,5 @@ edition = "2021" publish = false [dependencies] -icu = { version = "2.0.0-dev", features = ["serde"] } -icu_provider_blob = "2.0.0-dev" +icu = { version = "2.0.0-beta1", features = ["serde"] } +icu_provider_blob = "2.0.0-beta1" diff --git a/tutorials/rust/custom_compiled/Cargo.lock b/tutorials/rust/custom_compiled/Cargo.lock index 83bc9c0ceda..5659943b012 100644 --- a/tutorials/rust/custom_compiled/Cargo.lock +++ b/tutorials/rust/custom_compiled/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -27,9 +27,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -38,13 +38,13 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "smallvec", @@ -53,7 +53,7 @@ dependencies = [ [[package]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", @@ -65,6 +65,7 @@ dependencies = [ "icu_list", "icu_locale", "icu_normalizer", + "icu_pattern", "icu_plurals", "icu_properties", "icu_provider", @@ -74,7 +75,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -89,7 +90,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -97,7 +98,7 @@ dependencies = [ [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -105,24 +106,26 @@ dependencies = [ "icu_locale_core", "icu_properties", "icu_provider", + "potential_utf", "writeable", "zerovec", ] [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -134,7 +137,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -142,9 +145,10 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -152,7 +156,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -161,9 +165,11 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", "icu_provider", "icu_timezone", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -172,7 +178,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -180,18 +186,20 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -199,13 +207,15 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", + "either", "fixed_decimal", "icu_collections", "icu_decimal", "icu_experimental_data", + "icu_list", "icu_locale", "icu_locale_core", "icu_normalizer", @@ -217,6 +227,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -227,7 +238,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -235,7 +246,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -246,7 +257,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -254,19 +265,21 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_locale_data", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -277,14 +290,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -300,25 +313,25 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", "writeable", "yoke", - "zerofrom", + "zerovec", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -329,7 +342,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -337,27 +350,28 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -372,7 +386,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -381,7 +395,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -390,7 +404,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -398,13 +412,14 @@ dependencies = [ "icu_locale_core", "icu_provider", "icu_segmenter_data", + "potential_utf", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -412,12 +427,14 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "displaydoc", "icu_calendar", "icu_provider", "icu_timezone_data", + "ixdtf", "tinystr", "zerotrie", "zerovec", @@ -425,14 +442,14 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -440,19 +457,19 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -487,44 +504,52 @@ dependencies = [ "autocfg", ] +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "zerovec", +] + [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -545,9 +570,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -567,7 +592,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -582,9 +607,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "utf16_iter" @@ -606,14 +631,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -623,7 +648,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -633,14 +658,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -650,7 +675,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "yoke", @@ -659,7 +684,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -668,7 +693,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -677,7 +702,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -685,23 +710,23 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -709,15 +734,15 @@ version = "0.0.0" [[patch.unused]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -725,28 +750,28 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/rust/custom_compiled/Cargo.toml b/tutorials/rust/custom_compiled/Cargo.toml index c64583b55b7..79691de8ac7 100644 --- a/tutorials/rust/custom_compiled/Cargo.toml +++ b/tutorials/rust/custom_compiled/Cargo.toml @@ -12,4 +12,4 @@ edition = "2021" publish = false [dependencies] -icu = "2.0.0-dev" +icu = "2.0.0-beta1" diff --git a/tutorials/rust/default/Cargo.lock b/tutorials/rust/default/Cargo.lock index 769bddc1f0e..3135d73d896 100644 --- a/tutorials/rust/default/Cargo.lock +++ b/tutorials/rust/default/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -27,9 +27,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -38,13 +38,13 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "smallvec", @@ -53,7 +53,7 @@ dependencies = [ [[package]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", @@ -65,6 +65,7 @@ dependencies = [ "icu_list", "icu_locale", "icu_normalizer", + "icu_pattern", "icu_plurals", "icu_properties", "icu_provider", @@ -74,7 +75,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -89,7 +90,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -97,7 +98,7 @@ dependencies = [ [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -105,24 +106,26 @@ dependencies = [ "icu_locale_core", "icu_properties", "icu_provider", + "potential_utf", "writeable", "zerovec", ] [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -134,7 +137,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -142,9 +145,10 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -152,7 +156,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -161,9 +165,11 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", "icu_provider", "icu_timezone", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -172,7 +178,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -180,18 +186,20 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -199,13 +207,15 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", + "either", "fixed_decimal", "icu_collections", "icu_decimal", "icu_experimental_data", + "icu_list", "icu_locale", "icu_locale_core", "icu_normalizer", @@ -217,6 +227,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -227,7 +238,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -235,7 +246,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -246,7 +257,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -254,19 +265,21 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_locale_data", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -277,14 +290,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -300,25 +313,25 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", "writeable", "yoke", - "zerofrom", + "zerovec", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -329,7 +342,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -337,27 +350,28 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -372,7 +386,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -381,7 +395,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -390,7 +404,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -398,13 +412,14 @@ dependencies = [ "icu_locale_core", "icu_provider", "icu_segmenter_data", + "potential_utf", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -412,12 +427,14 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "displaydoc", "icu_calendar", "icu_provider", "icu_timezone_data", + "ixdtf", "tinystr", "zerotrie", "zerovec", @@ -425,14 +442,14 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -440,19 +457,19 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -487,44 +504,52 @@ dependencies = [ "autocfg", ] +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "zerovec", +] + [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -545,9 +570,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -567,7 +592,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -582,9 +607,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "utf16_iter" @@ -606,14 +631,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -623,7 +648,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -633,14 +658,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -650,7 +675,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "yoke", @@ -659,7 +684,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -668,7 +693,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -677,7 +702,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -685,23 +710,23 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -709,15 +734,15 @@ version = "0.0.0" [[patch.unused]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -725,28 +750,28 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/rust/default/Cargo.toml b/tutorials/rust/default/Cargo.toml index acff9f37c6d..f04e0ce64d8 100644 --- a/tutorials/rust/default/Cargo.toml +++ b/tutorials/rust/default/Cargo.toml @@ -12,4 +12,4 @@ edition = "2021" publish = false [dependencies] -icu = "2.0.0-dev" +icu = "2.0.0-beta1" diff --git a/tutorials/rust/experimental/Cargo.lock b/tutorials/rust/experimental/Cargo.lock index 042a05129b1..1e8f79af2ee 100644 --- a/tutorials/rust/experimental/Cargo.lock +++ b/tutorials/rust/experimental/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -27,9 +27,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -38,13 +38,13 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "smallvec", @@ -53,7 +53,7 @@ dependencies = [ [[package]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", @@ -65,6 +65,7 @@ dependencies = [ "icu_list", "icu_locale", "icu_normalizer", + "icu_pattern", "icu_plurals", "icu_properties", "icu_provider", @@ -74,7 +75,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -89,7 +90,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -97,7 +98,7 @@ dependencies = [ [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -105,24 +106,26 @@ dependencies = [ "icu_locale_core", "icu_properties", "icu_provider", + "potential_utf", "writeable", "zerovec", ] [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -134,7 +137,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -142,9 +145,10 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -152,7 +156,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -161,10 +165,12 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", "icu_provider", "icu_timezone", "litemap", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -173,7 +179,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -181,18 +187,20 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -200,13 +208,15 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", + "either", "fixed_decimal", "icu_collections", "icu_decimal", "icu_experimental_data", + "icu_list", "icu_locale", "icu_locale_core", "icu_normalizer", @@ -218,6 +228,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -228,7 +239,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -236,7 +247,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -247,7 +258,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -255,19 +266,21 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_locale_data", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -278,14 +291,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -301,25 +314,25 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", "writeable", "yoke", - "zerofrom", + "zerovec", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -330,7 +343,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -338,27 +351,28 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -373,7 +387,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -382,7 +396,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -391,7 +405,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -399,13 +413,14 @@ dependencies = [ "icu_locale_core", "icu_provider", "icu_segmenter_data", + "potential_utf", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -413,12 +428,14 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "displaydoc", "icu_calendar", "icu_provider", "icu_timezone_data", + "ixdtf", "tinystr", "zerotrie", "zerovec", @@ -426,14 +443,14 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -441,19 +458,19 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -488,44 +505,52 @@ dependencies = [ "autocfg", ] +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "zerovec", +] + [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -546,9 +571,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -568,7 +593,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -583,9 +608,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "utf16_iter" @@ -607,14 +632,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -624,7 +649,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -634,14 +659,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -651,7 +676,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "yoke", @@ -660,7 +685,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -669,7 +694,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -678,7 +703,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -686,23 +711,23 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -710,15 +735,15 @@ version = "0.0.0" [[patch.unused]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -726,28 +751,28 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/rust/experimental/Cargo.toml b/tutorials/rust/experimental/Cargo.toml index 207fcb1fffa..d4a7263c4cc 100644 --- a/tutorials/rust/experimental/Cargo.toml +++ b/tutorials/rust/experimental/Cargo.toml @@ -12,4 +12,4 @@ edition = "2021" publish = false [dependencies] -icu = { version = "2.0.0-dev", features = ["experimental"] } +icu = { version = "2.0.0-beta1", features = ["experimental"] } diff --git a/tutorials/rust/harfbuzz/Cargo.lock b/tutorials/rust/harfbuzz/Cargo.lock index 54189c2a7da..00de20a63eb 100644 --- a/tutorials/rust/harfbuzz/Cargo.lock +++ b/tutorials/rust/harfbuzz/Cargo.lock @@ -10,9 +10,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cc" -version = "1.0.98" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] [[package]] name = "core-foundation" @@ -26,9 +29,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -68,9 +71,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -148,9 +151,10 @@ checksum = "2b2b09c6c4711837cc213910511345490ee139c6dbb368800f775b6a53b373ec" [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -165,24 +169,11 @@ dependencies = [ "icu_normalizer", "icu_properties", "icu_provider", - "tinystr", -] - -[[package]] -name = "icu_locale" -version = "1.5.0" -dependencies = [ - "displaydoc", - "icu_locale_core", - "icu_locale_data", - "icu_provider", - "tinystr", - "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -191,16 +182,9 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locale_data" -version = "1.5.0" -dependencies = [ - "icu_provider_baked", -] - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -216,34 +200,35 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -258,7 +243,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -267,7 +252,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -276,58 +261,72 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "zerovec", +] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" version = "1.13.2" @@ -342,9 +341,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -364,7 +363,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -380,9 +379,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "utf16_iter" @@ -426,11 +425,11 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -440,7 +439,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -450,14 +449,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -467,14 +466,16 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", + "yoke", + "zerofrom", ] [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -483,7 +484,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -492,7 +493,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -500,31 +501,31 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" [[patch.unused]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -532,128 +533,136 @@ version = "0.0.0" [[patch.unused]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" [[patch.unused]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" + +[[patch.unused]] +name = "icu_locale" +version = "2.0.0-beta1" + +[[patch.unused]] +name = "icu_locale_data" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" [[patch.unused]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/rust/sync/Cargo.lock b/tutorials/rust/sync/Cargo.lock index 97f045e99d8..b0d9a4854e4 100644 --- a/tutorials/rust/sync/Cargo.lock +++ b/tutorials/rust/sync/Cargo.lock @@ -4,13 +4,13 @@ version = 3 [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.1.1" +version = "0.1.2" dependencies = [ "core_maths", "displaydoc", @@ -27,9 +27,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -38,13 +38,13 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "fixed_decimal" -version = "0.5.6" +version = "0.6.0" dependencies = [ "displaydoc", "smallvec", @@ -53,7 +53,7 @@ dependencies = [ [[package]] name = "icu" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_calendar", "icu_casemap", @@ -65,6 +65,7 @@ dependencies = [ "icu_list", "icu_locale", "icu_normalizer", + "icu_pattern", "icu_plurals", "icu_properties", "icu_provider", @@ -74,7 +75,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "calendrical_calculations", "displaydoc", @@ -89,7 +90,7 @@ dependencies = [ [[package]] name = "icu_calendar_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -97,7 +98,7 @@ dependencies = [ [[package]] name = "icu_casemap" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_casemap_data", @@ -105,24 +106,26 @@ dependencies = [ "icu_locale_core", "icu_properties", "icu_provider", + "potential_utf", "writeable", "zerovec", ] [[package]] name = "icu_casemap_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_collator" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collator_data", "icu_collections", + "icu_locale_core", "icu_normalizer", "icu_properties", "icu_provider", @@ -134,7 +137,7 @@ dependencies = [ [[package]] name = "icu_collator_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -142,9 +145,10 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", @@ -152,7 +156,7 @@ dependencies = [ [[package]] name = "icu_datetime" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "either", @@ -161,9 +165,11 @@ dependencies = [ "icu_datetime_data", "icu_decimal", "icu_locale_core", + "icu_pattern", "icu_plurals", "icu_provider", "icu_timezone", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -172,7 +178,7 @@ dependencies = [ [[package]] name = "icu_datetime_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -180,18 +186,20 @@ dependencies = [ [[package]] name = "icu_decimal" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", "icu_decimal_data", "icu_provider", + "tinystr", "writeable", + "zerovec", ] [[package]] name = "icu_decimal_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -199,13 +207,15 @@ dependencies = [ [[package]] name = "icu_experimental" -version = "0.1.0" +version = "0.2.0" dependencies = [ "displaydoc", + "either", "fixed_decimal", "icu_collections", "icu_decimal", "icu_experimental_data", + "icu_list", "icu_locale", "icu_locale_core", "icu_normalizer", @@ -217,6 +227,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", + "potential_utf", "smallvec", "tinystr", "writeable", @@ -227,7 +238,7 @@ dependencies = [ [[package]] name = "icu_experimental_data" -version = "0.1.0" +version = "0.2.0-dev" dependencies = [ "icu_locale", "icu_provider_baked", @@ -235,7 +246,7 @@ dependencies = [ [[package]] name = "icu_list" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_list_data", @@ -246,7 +257,7 @@ dependencies = [ [[package]] name = "icu_list_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -254,19 +265,21 @@ dependencies = [ [[package]] name = "icu_locale" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", + "icu_collections", "icu_locale_core", "icu_locale_data", "icu_provider", + "potential_utf", "tinystr", "zerovec", ] [[package]] name = "icu_locale_core" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "litemap", @@ -277,14 +290,14 @@ dependencies = [ [[package]] name = "icu_locale_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", @@ -300,25 +313,25 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "icu_pattern" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "either", "writeable", "yoke", - "zerofrom", + "zerovec", ] [[package]] name = "icu_plurals" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "fixed_decimal", @@ -329,7 +342,7 @@ dependencies = [ [[package]] name = "icu_plurals_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -337,27 +350,28 @@ dependencies = [ [[package]] name = "icu_properties" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_collections", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ - "icu_locale", "icu_provider_baked", ] [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "displaydoc", "icu_locale_core", @@ -372,7 +386,7 @@ dependencies = [ [[package]] name = "icu_provider_baked" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider", "writeable", @@ -381,7 +395,7 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "proc-macro2", "quote", @@ -390,7 +404,7 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "core_maths", "displaydoc", @@ -398,13 +412,14 @@ dependencies = [ "icu_locale_core", "icu_provider", "icu_segmenter_data", + "potential_utf", "utf8_iter", "zerovec", ] [[package]] name = "icu_segmenter_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_locale", "icu_provider_baked", @@ -412,12 +427,14 @@ dependencies = [ [[package]] name = "icu_timezone" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ + "calendrical_calculations", "displaydoc", "icu_calendar", "icu_provider", "icu_timezone_data", + "ixdtf", "tinystr", "zerotrie", "zerovec", @@ -425,14 +442,14 @@ dependencies = [ [[package]] name = "icu_timezone_data" -version = "1.5.0" +version = "2.0.0-beta1" dependencies = [ "icu_provider_baked", ] [[package]] name = "ixdtf" -version = "0.2.0" +version = "0.3.0" dependencies = [ "displaydoc", "utf8_iter", @@ -440,19 +457,19 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -487,44 +504,52 @@ dependencies = [ "autocfg", ] +[[package]] +name = "potential_utf" +version = "0.1.0" +dependencies = [ + "serde", + "zerovec", +] + [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -545,9 +570,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -567,7 +592,7 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.0" dependencies = [ "displaydoc", "zerovec", @@ -582,9 +607,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "utf16_iter" @@ -606,14 +631,14 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.0" dependencies = [ "either", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" dependencies = [ "serde", "stable_deref_trait", @@ -623,7 +648,7 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" dependencies = [ "proc-macro2", "quote", @@ -633,14 +658,14 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" dependencies = [ "proc-macro2", "quote", @@ -650,7 +675,7 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.3" +version = "0.2.0" dependencies = [ "displaydoc", "yoke", @@ -659,7 +684,7 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.0" dependencies = [ "yoke", "zerofrom", @@ -668,7 +693,7 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.0" dependencies = [ "proc-macro2", "quote", @@ -677,7 +702,7 @@ dependencies = [ [[patch.unused]] name = "bies" -version = "0.2.2" +version = "0.2.3" [[patch.unused]] name = "crlify" @@ -685,23 +710,23 @@ version = "1.0.4" [[patch.unused]] name = "databake" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "databake-derive" -version = "0.1.8" +version = "0.2.0" [[patch.unused]] name = "deduplicating_array" -version = "0.1.6" +version = "0.1.7" [[patch.unused]] name = "icu4x-datagen" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu4x_ecma402" -version = "0.8.2" +version = "0.9.0-dev" [[patch.unused]] name = "icu_benchmark_macros" @@ -709,15 +734,15 @@ version = "0.0.0" [[patch.unused]] name = "icu_capi" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_codepointtrie_builder" -version = "0.3.8" +version = "0.4.0-dev" [[patch.unused]] name = "icu_freertos" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_harfbuzz" @@ -725,28 +750,28 @@ version = "0.2.0" [[patch.unused]] name = "icu_provider_adapters" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_blob" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_export" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_fs" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_registry" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "icu_provider_source" -version = "1.5.0" +version = "2.0.0-beta1" [[patch.unused]] name = "tzif" -version = "0.2.3" +version = "0.3.0-dev" diff --git a/tutorials/rust/sync/Cargo.toml b/tutorials/rust/sync/Cargo.toml index 0087caca206..bff2a9bfb04 100644 --- a/tutorials/rust/sync/Cargo.toml +++ b/tutorials/rust/sync/Cargo.toml @@ -12,4 +12,4 @@ edition = "2021" publish = false [dependencies] -icu = { version = "2.0.0-dev", features = ["sync"] } +icu = { version = "2.0.0-beta1", features = ["sync"] }