diff options
Diffstat (limited to 'vendor/icu_provider_macros')
| -rw-r--r-- | vendor/icu_provider_macros/.cargo-checksum.json | 2 | ||||
| -rw-r--r-- | vendor/icu_provider_macros/Cargo.toml | 14 | ||||
| -rw-r--r-- | vendor/icu_provider_macros/LICENSE | 79 | ||||
| -rw-r--r-- | vendor/icu_provider_macros/README.md | 4 | ||||
| -rw-r--r-- | vendor/icu_provider_macros/src/lib.rs | 325 | ||||
| -rw-r--r-- | vendor/icu_provider_macros/src/tests.rs | 65 |
6 files changed, 317 insertions, 172 deletions
diff --git a/vendor/icu_provider_macros/.cargo-checksum.json b/vendor/icu_provider_macros/.cargo-checksum.json index b33f9def3..573555e71 100644 --- a/vendor/icu_provider_macros/.cargo-checksum.json +++ b/vendor/icu_provider_macros/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"8c8bf034fddb240e039b17b73842d93216c87c0f8a0d3486302187a004bcb461","LICENSE":"4ad7541d66a407234e2c84902124cef325c29f3e966353efdb800bedb8b8da21","README.md":"f9f95075851c9c3b7d0559c25794ebcad5dee957c7fb27c343418a3324f15b8a","src/lib.rs":"1376fd3fb06bc354eb24c97b1bf47f80b0d408644f1aa5885db3f374aa39f74a","src/tests.rs":"3a34d070c375eade0808b7dbe11157450bc62d5a6f056c38ac129104487d8ea9"},"package":"dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"}
\ No newline at end of file +{"files":{"Cargo.toml":"98913f20a28e37da354cd53c93f93c9ff43a5805bbca80607eb982a5fdeb8b62","LICENSE":"853f87c96f3d249f200fec6db1114427bc8bdf4afddc93c576956d78152ce978","README.md":"581f43ca8c5faa60ff9ffdba3e31a8aca86b98b27cc0f325736ccff7e27689ac","src/lib.rs":"0ac2289408e0993c35d79720312596b9e44e81428b80884de4b35395ccf6f666","src/tests.rs":"261669b626a01f2a58d3697fea47ad1f994609c7651a740caf749038c7c5fdaf"},"package":"2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99"}
\ No newline at end of file diff --git a/vendor/icu_provider_macros/Cargo.toml b/vendor/icu_provider_macros/Cargo.toml index fae6f93aa..870cb3ff3 100644 --- a/vendor/icu_provider_macros/Cargo.toml +++ b/vendor/icu_provider_macros/Cargo.toml @@ -11,10 +11,12 @@ [package] edition = "2021" +rust-version = "1.66" name = "icu_provider_macros" -version = "1.2.0" +version = "1.3.2" authors = ["The ICU4X Project Developers"] include = [ + "data/**/*", "src/**/*", "examples/**/*", "benches/**/*", @@ -24,9 +26,10 @@ include = [ "README.md", ] description = "Proc macros for ICU data providers" +homepage = "https://icu4x.unicode.org" readme = "README.md" categories = ["internationalization"] -license = "Unicode-DFS-2016" +license-file = "LICENSE" repository = "https://github.com/unicode-org/icu4x" [lib] @@ -40,7 +43,10 @@ version = "1.0.27" version = "1.0.9" [dependencies.syn] -version = "1.0.73" -features = ["full"] +version = "2" +features = [ + "full", + "parsing", +] [dev-dependencies] diff --git a/vendor/icu_provider_macros/LICENSE b/vendor/icu_provider_macros/LICENSE index 9858d01ab..9845aa5f4 100644 --- a/vendor/icu_provider_macros/LICENSE +++ b/vendor/icu_provider_macros/LICENSE @@ -1,49 +1,42 @@ -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE - -See Terms of Use <https://www.unicode.org/copyright.html> -for definitions of Unicode Inc.’s Data Files and Software. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. +UNICODE LICENSE V3 COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2022 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in https://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. +Copyright © 2020-2023 Unicode, Inc. + +NOTICE TO USER: Carefully read the following legal agreement. BY +DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR +SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT +DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of data files and any associated documentation (the "Data Files") or +software and any associated documentation (the "Software") to deal in the +Data Files or Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, and/or sell +copies of the Data Files or Software, and to permit persons to whom the +Data Files or Software are furnished to do so, provided that either (a) +this copyright and permission notice appear with all copies of the Data +Files or Software, or (b) this copyright and permission notice appear in +associated Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +THIRD PARTY RIGHTS. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE +BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA +FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in these Data Files or Software without prior written +authorization of the copyright holder. — diff --git a/vendor/icu_provider_macros/README.md b/vendor/icu_provider_macros/README.md index c9ea9d21c..a76ac4abd 100644 --- a/vendor/icu_provider_macros/README.md +++ b/vendor/icu_provider_macros/README.md @@ -1,9 +1,13 @@ # icu_provider_macros [](https://crates.io/crates/icu_provider_macros) +<!-- cargo-rdme start --> + Proc macros for the ICU4X data provider. These macros are re-exported from `icu_provider`. +<!-- cargo-rdme end --> + ## More Information For more information on development, authorship, contributing etc. please visit [`ICU4X home page`](https://github.com/unicode-org/icu4x). diff --git a/vendor/icu_provider_macros/src/lib.rs b/vendor/icu_provider_macros/src/lib.rs index fee0c8afa..1b0266242 100644 --- a/vendor/icu_provider_macros/src/lib.rs +++ b/vendor/icu_provider_macros/src/lib.rs @@ -24,20 +24,21 @@ extern crate proc_macro; use proc_macro::TokenStream; +use proc_macro2::Span; use proc_macro2::TokenStream as TokenStream2; use quote::quote; +use syn::parenthesized; +use syn::parse::{self, Parse, ParseStream}; use syn::parse_macro_input; +use syn::punctuated::Punctuated; use syn::spanned::Spanned; -use syn::AttributeArgs; use syn::DeriveInput; -use syn::Lit; -use syn::Meta; -use syn::NestedMeta; - +use syn::{Ident, LitStr, Path, Token}; #[cfg(test)] mod tests; #[proc_macro_attribute] + /// The `#[data_struct]` attribute should be applied to all types intended /// for use in a `DataStruct`. /// @@ -50,6 +51,19 @@ mod tests; /// by adding symbols with optional key strings: /// /// ``` +/// # // We DO NOT want to pull in the `icu` crate as a dev-dependency, +/// # // because that will rebuild the whole tree in proc macro mode +/// # // when using cargo test --all-features --all-targets. +/// # pub mod icu { +/// # pub mod locid_transform { +/// # pub mod fallback { +/// # pub use icu_provider::_internal::{LocaleFallbackPriority, LocaleFallbackSupplement}; +/// # } +/// # } +/// # pub use icu_provider::_internal::locid; +/// # } +/// use icu::locid_transform::fallback::*; +/// use icu::locid::extensions::unicode::key; /// use icu_provider::prelude::*; /// use std::borrow::Cow; /// @@ -73,18 +87,18 @@ mod tests; /// assert_eq!(&*BarV1Marker::KEY.path(), "demo/bar@1"); /// assert_eq!( /// BarV1Marker::KEY.metadata().fallback_priority, -/// icu_provider::FallbackPriority::Language +/// LocaleFallbackPriority::Language /// ); /// assert_eq!(BarV1Marker::KEY.metadata().extension_key, None); /// /// assert_eq!(&*BazV1Marker::KEY.path(), "demo/baz@1"); /// assert_eq!( /// BazV1Marker::KEY.metadata().fallback_priority, -/// icu_provider::FallbackPriority::Region +/// LocaleFallbackPriority::Region /// ); /// assert_eq!( /// BazV1Marker::KEY.metadata().extension_key, -/// Some(icu::locid::extensions_unicode_key!("ca")) +/// Some(key!("ca")) /// ); /// ``` /// @@ -92,12 +106,182 @@ mod tests; /// implement it on the markers. pub fn data_struct(attr: TokenStream, item: TokenStream) -> TokenStream { TokenStream::from(data_struct_impl( - parse_macro_input!(attr as AttributeArgs), + parse_macro_input!(attr as DataStructArgs), parse_macro_input!(item as DeriveInput), )) } -fn data_struct_impl(attr: AttributeArgs, input: DeriveInput) -> TokenStream2 { +pub(crate) struct DataStructArgs { + args: Punctuated<DataStructArg, Token![,]>, +} + +impl Parse for DataStructArgs { + fn parse(input: ParseStream<'_>) -> parse::Result<Self> { + let args = input.parse_terminated(DataStructArg::parse, Token![,])?; + Ok(Self { args }) + } +} +struct DataStructArg { + marker_name: Path, + key_lit: Option<LitStr>, + fallback_by: Option<LitStr>, + extension_key: Option<LitStr>, + fallback_supplement: Option<LitStr>, + singleton: bool, +} + +impl DataStructArg { + fn new(marker_name: Path) -> Self { + Self { + marker_name, + key_lit: None, + fallback_by: None, + extension_key: None, + fallback_supplement: None, + singleton: false, + } + } +} + +impl Parse for DataStructArg { + fn parse(input: ParseStream<'_>) -> parse::Result<Self> { + let path: Path = input.parse()?; + + fn at_most_one_option<T>( + o: &mut Option<T>, + new: T, + name: &str, + span: Span, + ) -> parse::Result<()> { + if o.replace(new).is_some() { + Err(parse::Error::new( + span, + format!("marker() cannot contain multiple {name}s"), + )) + } else { + Ok(()) + } + } + + if path.is_ident("marker") { + let content; + let paren = parenthesized!(content in input); + let mut marker_name: Option<Path> = None; + let mut key_lit: Option<LitStr> = None; + let mut fallback_by: Option<LitStr> = None; + let mut extension_key: Option<LitStr> = None; + let mut fallback_supplement: Option<LitStr> = None; + let mut singleton = false; + let punct = content.parse_terminated(DataStructMarkerArg::parse, Token![,])?; + + for entry in punct { + match entry { + DataStructMarkerArg::Path(path) => { + at_most_one_option(&mut marker_name, path, "marker", input.span())?; + } + DataStructMarkerArg::NameValue(name, value) => { + if name == "fallback_by" { + at_most_one_option( + &mut fallback_by, + value, + "fallback_by", + paren.span.join(), + )?; + } else if name == "extension_key" { + at_most_one_option( + &mut extension_key, + value, + "extension_key", + paren.span.join(), + )?; + } else if name == "fallback_supplement" { + at_most_one_option( + &mut fallback_supplement, + value, + "fallback_supplement", + paren.span.join(), + )?; + } else { + return Err(parse::Error::new( + name.span(), + format!("unknown option {name} in marker()"), + )); + } + } + DataStructMarkerArg::Lit(lit) => { + at_most_one_option(&mut key_lit, lit, "literal key", input.span())?; + } + DataStructMarkerArg::Singleton => { + singleton = true; + } + } + } + let marker_name = if let Some(marker_name) = marker_name { + marker_name + } else { + return Err(parse::Error::new( + input.span(), + "marker() must contain a marker!", + )); + }; + + Ok(Self { + marker_name, + key_lit, + fallback_by, + extension_key, + fallback_supplement, + singleton, + }) + } else { + let mut this = DataStructArg::new(path); + let lookahead = input.lookahead1(); + if lookahead.peek(Token![=]) { + let _t: Token![=] = input.parse()?; + let lit: LitStr = input.parse()?; + this.key_lit = Some(lit); + Ok(this) + } else { + Ok(this) + } + } + } +} + +/// A single argument to `marker()` in `#[data_struct(..., marker(...), ...)] +enum DataStructMarkerArg { + Path(Path), + NameValue(Ident, LitStr), + Lit(LitStr), + Singleton, +} +impl Parse for DataStructMarkerArg { + fn parse(input: ParseStream<'_>) -> parse::Result<Self> { + let lookahead = input.lookahead1(); + if lookahead.peek(LitStr) { + Ok(DataStructMarkerArg::Lit(input.parse()?)) + } else { + let path: Path = input.parse()?; + let lookahead = input.lookahead1(); + if lookahead.peek(Token![=]) { + let _tok: Token![=] = input.parse()?; + let ident = path.get_ident().ok_or_else(|| { + parse::Error::new(path.span(), "Expected identifier before `=`, found path") + })?; + Ok(DataStructMarkerArg::NameValue( + ident.clone(), + input.parse()?, + )) + } else if path.is_ident("singleton") { + Ok(DataStructMarkerArg::Singleton) + } else { + Ok(DataStructMarkerArg::Path(path)) + } + } + } +} + +fn data_struct_impl(attr: DataStructArgs, input: DeriveInput) -> TokenStream2 { if input.generics.type_params().count() > 0 { return syn::Error::new( input.generics.span(), @@ -126,7 +310,7 @@ fn data_struct_impl(attr: AttributeArgs, input: DeriveInput) -> TokenStream2 { let bake_derive = input .attrs .iter() - .find(|a| a.path.is_ident("databake")) + .find(|a| a.path().is_ident("databake")) .map(|a| { quote! { #[derive(databake::Bake)] @@ -137,74 +321,23 @@ fn data_struct_impl(attr: AttributeArgs, input: DeriveInput) -> TokenStream2 { let mut result = TokenStream2::new(); - for single_attr in attr.into_iter() { - let mut marker_name: Option<syn::Path> = None; - let mut key_lit: Option<syn::LitStr> = None; - let mut fallback_by: Option<syn::LitStr> = None; - let mut extension_key: Option<syn::LitStr> = None; - let mut fallback_supplement: Option<syn::LitStr> = None; - - match single_attr { - NestedMeta::Meta(Meta::List(meta_list)) => { - match meta_list.path.get_ident() { - Some(ident) if ident.to_string().as_str() == "marker" => (), - _ => panic!("Meta list must be `marker(...)`"), - } - for inner_meta in meta_list.nested.into_iter() { - match inner_meta { - NestedMeta::Meta(Meta::Path(path)) => { - marker_name = Some(path); - } - NestedMeta::Lit(Lit::Str(lit_str)) => { - key_lit = Some(lit_str); - } - NestedMeta::Meta(Meta::NameValue(name_value)) => { - let lit_str = match name_value.lit { - Lit::Str(lit_str) => lit_str, - _ => panic!("Values in marker() must be strings"), - }; - let name_ident_str = match name_value.path.get_ident() { - Some(ident) => ident.to_string(), - None => panic!("Names in marker() must be identifiers"), - }; - match name_ident_str.as_str() { - "fallback_by" => fallback_by = Some(lit_str), - "extension_key" => extension_key = Some(lit_str), - "fallback_supplement" => fallback_supplement = Some(lit_str), - _ => panic!("Invalid argument name in marker()"), - } - } - _ => panic!("Invalid argument in marker()"), - } - } - } - NestedMeta::Meta(Meta::NameValue(name_value)) => { - marker_name = Some(name_value.path); - match name_value.lit { - syn::Lit::Str(lit_str) => key_lit = Some(lit_str), - _ => panic!("Key must be a string"), - }; - } - NestedMeta::Meta(Meta::Path(path)) => { - marker_name = Some(path); - } - _ => { - panic!("Invalid attribute to #[data_struct]") - } - } - - let marker_name = match marker_name { - Some(path) => path, - None => panic!("#[data_struct] arguments must include a marker name"), - }; + for single_attr in attr.args { + let DataStructArg { + marker_name, + key_lit, + fallback_by, + extension_key, + fallback_supplement, + singleton, + } = single_attr; - let docs = if let Some(key_lit) = &key_lit { - let fallback_by_docs_str = match &fallback_by { - Some(fallback_by) => fallback_by.value(), + let docs = if let Some(ref key_lit) = key_lit { + let fallback_by_docs_str = match fallback_by { + Some(ref fallback_by) => fallback_by.value(), None => "language (default)".to_string(), }; - let extension_key_docs_str = match &extension_key { - Some(extension_key) => extension_key.value(), + let extension_key_docs_str = match extension_key { + Some(ref extension_key) => extension_key.value(), None => "none (default)".to_string(), }; format!("Marker type for [`{}`]: \"{}\"\n\n- Fallback priority: {}\n- Extension keyword: {}", name, key_lit.value(), fallback_by_docs_str, extension_key_docs_str) @@ -221,38 +354,48 @@ fn data_struct_impl(attr: AttributeArgs, input: DeriveInput) -> TokenStream2 { } )); - if let Some(key_lit) = &key_lit { + if let Some(key_lit) = key_lit { let key_str = key_lit.value(); let fallback_by_expr = if let Some(fallback_by_lit) = fallback_by { match fallback_by_lit.value().as_str() { - "region" => quote! {icu_provider::FallbackPriority::Region}, - "collation" => quote! {icu_provider::FallbackPriority::Collation}, - "language" => quote! {icu_provider::FallbackPriority::Language}, + "region" => { + quote! {icu_provider::_internal::LocaleFallbackPriority::Region} + } + "collation" => { + quote! {icu_provider::_internal::LocaleFallbackPriority::Collation} + } + "language" => { + quote! {icu_provider::_internal::LocaleFallbackPriority::Language} + } _ => panic!("Invalid value for fallback_by"), } } else { - quote! {icu_provider::FallbackPriority::const_default()} + quote! {icu_provider::_internal::LocaleFallbackPriority::const_default()} }; let extension_key_expr = if let Some(extension_key_lit) = extension_key { - quote! {Some(icu_provider::_internal::extensions_unicode_key!(#extension_key_lit))} + quote! {Some(icu_provider::_internal::locid::extensions::unicode::key!(#extension_key_lit))} } else { quote! {None} }; - let fallback_supplement_expr = - if let Some(fallback_supplement_lit) = fallback_supplement { - match fallback_supplement_lit.value().as_str() { - "collation" => quote! {Some(icu_provider::FallbackSupplement::Collation)}, - _ => panic!("Invalid value for fallback_supplement"), + let fallback_supplement_expr = if let Some(fallback_supplement_lit) = + fallback_supplement + { + match fallback_supplement_lit.value().as_str() { + "collation" => { + quote! {Some(icu_provider::_internal::LocaleFallbackSupplement::Collation)} } - } else { - quote! {None} - }; + _ => panic!("Invalid value for fallback_supplement"), + } + } else { + quote! {None} + }; result.extend(quote!( impl icu_provider::KeyedDataMarker for #marker_name { const KEY: icu_provider::DataKey = icu_provider::data_key!(#key_str, icu_provider::DataKeyMetadata::construct_internal( #fallback_by_expr, #extension_key_expr, - #fallback_supplement_expr + #fallback_supplement_expr, + #singleton, )); } )); diff --git a/vendor/icu_provider_macros/src/tests.rs b/vendor/icu_provider_macros/src/tests.rs index 32be158c7..908cf6e33 100644 --- a/vendor/icu_provider_macros/src/tests.rs +++ b/vendor/icu_provider_macros/src/tests.rs @@ -5,16 +5,9 @@ use crate::data_struct_impl; use proc_macro2::TokenStream as TokenStream2; use quote::quote; -use syn::{DeriveInput, NestedMeta}; -fn check(attr: Vec<TokenStream2>, item: TokenStream2, expected: TokenStream2) { - let actual = data_struct_impl( - attr.into_iter() - .map(syn::parse2) - .collect::<syn::parse::Result<Vec<NestedMeta>>>() - .unwrap(), - syn::parse2::<DeriveInput>(item).unwrap(), - ); +fn check(attr: TokenStream2, item: TokenStream2, expected: TokenStream2) { + let actual = data_struct_impl(syn::parse2(attr).unwrap(), syn::parse2(item).unwrap()); assert_eq!(expected.to_string(), actual.to_string()); } @@ -23,7 +16,7 @@ fn check(attr: Vec<TokenStream2>, item: TokenStream2, expected: TokenStream2) { fn test_basic() { // #[data_struct] check( - vec![], + quote!(), quote!( pub struct FooV1; ), @@ -38,7 +31,7 @@ fn test_basic() { fn test_data_marker() { // #[data_struct(FooV1Marker)] check( - vec![quote!(FooV1Marker)], + quote!(FooV1Marker), quote!( pub struct FooV1; ), @@ -58,7 +51,7 @@ fn test_data_marker() { fn test_keyed_data_marker() { // #[data_struct(BarV1Marker = "demo/bar@1")] check( - vec![quote!(BarV1Marker = "demo/bar@1")], + quote!(BarV1Marker = "demo/bar@1"), quote!( pub struct FooV1; ), @@ -72,9 +65,10 @@ fn test_keyed_data_marker() { const KEY: icu_provider::DataKey = icu_provider::data_key!( "demo/bar@1", icu_provider::DataKeyMetadata::construct_internal( - icu_provider::FallbackPriority::const_default(), + icu_provider::_internal::LocaleFallbackPriority::const_default(), + None, None, - None + false, )); } #[derive(icu_provider::prelude::yoke::Yokeable, icu_provider::prelude::zerofrom::ZeroFrom)] @@ -87,10 +81,10 @@ fn test_keyed_data_marker() { fn test_multi_named_keyed_data_marker() { // #[data_struct(FooV1Marker, BarV1Marker = "demo/bar@1", BazV1Marker = "demo/baz@1")] check( - vec![ - quote!(FooV1Marker), - quote!(BarV1Marker = "demo/bar@1"), - quote!(BazV1Marker = "demo/baz@1"), + quote![ + FooV1Marker, + BarV1Marker = "demo/bar@1", + BazV1Marker = "demo/baz@1", ], quote!( pub struct FooV1<'data>; @@ -110,9 +104,10 @@ fn test_multi_named_keyed_data_marker() { const KEY: icu_provider::DataKey = icu_provider::data_key!( "demo/bar@1", icu_provider::DataKeyMetadata::construct_internal( - icu_provider::FallbackPriority::const_default(), + icu_provider::_internal::LocaleFallbackPriority::const_default(), + None, None, - None + false, )); } #[doc = "Marker type for [`FooV1`]: \"demo/baz@1\"\n\n- Fallback priority: language (default)\n- Extension keyword: none (default)"] @@ -124,9 +119,10 @@ fn test_multi_named_keyed_data_marker() { const KEY: icu_provider::DataKey = icu_provider::data_key!( "demo/baz@1", icu_provider::DataKeyMetadata::construct_internal( - icu_provider::FallbackPriority::const_default(), + icu_provider::_internal::LocaleFallbackPriority::const_default(), None, - None + None, + false, )); } #[derive(icu_provider::prelude::yoke::Yokeable, icu_provider::prelude::zerofrom::ZeroFrom)] @@ -138,7 +134,7 @@ fn test_multi_named_keyed_data_marker() { #[test] fn test_databake() { check( - vec![quote!(BarV1Marker = "demo/bar@1")], + quote!(BarV1Marker = "demo/bar@1"), quote!( #[databake(path = test::path)] pub struct FooV1; @@ -155,9 +151,10 @@ fn test_databake() { const KEY: icu_provider::DataKey = icu_provider::data_key!( "demo/bar@1", icu_provider::DataKeyMetadata::construct_internal( - icu_provider::FallbackPriority::const_default(), + icu_provider::_internal::LocaleFallbackPriority::const_default(), + None, None, - None + false, )); } #[derive(icu_provider::prelude::yoke::Yokeable, icu_provider::prelude::zerofrom::ZeroFrom)] @@ -171,15 +168,16 @@ fn test_databake() { fn test_attributes() { // #[data_struct(FooV1Marker, marker(BarV1Marker, "demo/bar@1", fallback_by = "region", extension_kw = "ca"))] check( - vec![ - quote!(FooV1Marker), - quote!(marker( + quote![ + FooV1Marker, + marker( BarV1Marker, "demo/bar@1", fallback_by = "region", extension_key = "ca", - fallback_supplement = "collation" - )), + fallback_supplement = "collation", + singleton, + ), ], quote!( pub struct FooV1<'data>; @@ -199,9 +197,10 @@ fn test_attributes() { const KEY: icu_provider::DataKey = icu_provider::data_key!( "demo/bar@1", icu_provider::DataKeyMetadata::construct_internal( - icu_provider::FallbackPriority::Region, - Some(icu_provider::_internal::extensions_unicode_key!("ca")), - Some(icu_provider::FallbackSupplement::Collation) + icu_provider::_internal::LocaleFallbackPriority::Region, + Some(icu_provider::_internal::locid::extensions::unicode::key!("ca")), + Some(icu_provider::_internal::LocaleFallbackSupplement::Collation), + true, )); } #[derive(icu_provider::prelude::yoke::Yokeable, icu_provider::prelude::zerofrom::ZeroFrom)] |