finchie/l10n_embed - Change 6XEMHUGSNX5YSWZYM7PZUTTUMFODMGO74QLHGEXQ5LAC7LPS7JNQC

Use full `Locale` instead of `LanguageIdentifier` subset

The input data (system locales) was already being lossily converted to LanguageIdentifier, when Locale could be used directly instead.

Created by finchie on July 21, 2025

6XEMHUGSNX5YSWZYM7PZUTTUMFODMGO74QLHGEXQ5LAC7LPS7JNQC

Dependencies

In channels

main

Change contents

Replacement in fluent_embed_derive/tests/selectors.rs at line 7 [6.140]
∅:D[4.70] → [5.0:46]
B:BD[7.40] → [5.0:46]
```
use icu_locale::{langid, LanguageIdentifier};
```
[4.70]
[8.0]
```
use icu_locale::{Locale, locale};
```

Replacement in fluent_embed_derive/tests/selectors.rs at line 17 [6.140]

B:BD[9.65] → [10.46:244]

#[case::zero_en(langid!("en-US"), 0, "You have 0 unread emails.")]
#[case::one_en(langid!("en-US"), 1, "You have 1 unread email.")]
#[case::two_en(langid!("en-US"), 2, "You have 2 unread emails.")]

[9.65]

[10.244]

#[case::zero_en(locale!("en-US"), 0, "You have 0 unread emails.")]
#[case::one_en(locale!("en-US"), 1, "You have 1 unread email.")]
#[case::two_en(locale!("en-US"), 2, "You have 2 unread emails.")]

Replacement in fluent_embed_derive/tests/selectors.rs at line 21 [6.140]
B:BD[10.260] → [10.260:282]
```
    langid!("en-US"),
```
[10.260]
[10.282]
```
    locale!("en-US"),
```

Replacement in fluent_embed_derive/tests/selectors.rs at line 25 [6.140]

B:BD[10.356] → [10.356:661]

#[case::zero_fr(langid!("fr"), 0, "Vous avez 0 e-mail non lu.")]
#[case::one_fr(langid!("fr"), 1, "Vous avez 1 e-mail non lu.")]
#[case::two_fr(langid!("fr"), 2, "Vous avez 2 e-mails non lus.")]
#[case::max_fr(langid!("fr"), u64::MAX, "Vous avez 18 446 744 073 709 551 615 e-mails non lus.")]

[10.356]

[7.1067]

#[case::zero_fr(locale!("fr"), 0, "Vous avez 0 e-mail non lu.")]
#[case::one_fr(locale!("fr"), 1, "Vous avez 1 e-mail non lu.")]
#[case::two_fr(locale!("fr"), 2, "Vous avez 2 e-mails non lus.")]
#[case::max_fr(locale!("fr"), u64::MAX, "Vous avez 18 446 744 073 709 551 615 e-mails non lus.")]

Replacement in fluent_embed_derive/tests/selectors.rs at line 30 [6.140]
B:BD[7.1090] → [10.662:702]
```
    #[case] locale: LanguageIdentifier,
```
[7.1090]
[10.702]
```
    #[case] locale: Locale,
```
Replacement in fluent_embed_derive/tests/recursive.rs at line 7 [4.164]
B:BD[4.326] → [4.326:350]
```
use icu_locale::langid;
```
[4.326]
[4.350]
```
use icu_locale::locale;
```
Replacement in fluent_embed_derive/tests/recursive.rs at line 32 [4.164]
B:BD[4.772] → [4.772:798]
```
        langid!("en-US"),
```
[4.772]
[4.798]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/recursive.rs at line 46 [4.164]
B:BD[4.1031] → [4.1031:1057]
```
        langid!("en-US"),
```
[4.1031]
[4.1057]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/placeables.rs at line 7 [12.38]
∅:D[11.70] → [5.47:71]
B:BD[12.176] → [5.47:71]
```
use icu_locale::langid;
```
[11.70]
[12.233]
```
use icu_locale::locale;
```
Replacement in fluent_embed_derive/tests/placeables.rs at line 25 [12.38]
B:BD[11.448] → [11.448:474]
```
        langid!("en-US"),
```
[11.448]
[11.474]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/placeables.rs at line 39 [12.38]
B:BD[11.750] → [11.750:776]
```
        langid!("en-US"),
```
[11.750]
[11.776]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/placeables.rs at line 54 [12.38]
B:BD[11.1190] → [11.1190:1216]
```
        langid!("en-US"),
```
[11.1190]
[12.2015]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/lifetimes.rs at line 7 [4.1286]
B:BD[4.1434] → [4.1434:1458]
```
use icu_locale::langid;
```
[4.1434]
[4.1458]
```
use icu_locale::locale;
```
Replacement in fluent_embed_derive/tests/lifetimes.rs at line 20 [4.1286]
B:BD[4.1677] → [4.1677:1703]
```
        langid!("en-US"),
```
[4.1677]
[4.1703]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/lifetimes.rs at line 30 [4.1286]
B:BD[4.1864] → [4.1864:1890]
```
        langid!("en-US"),
```
[4.1864]
[4.1890]
```
        locale!("en-US"),
```
Replacement in fluent_embed_derive/tests/generics.rs at line 7 [4.1935]
B:BD[4.2083] → [4.2083:2107]
```
use icu_locale::langid;
```
[4.2083]
[4.2107]
```
use icu_locale::locale;
```

Replacement in fluent_embed_derive/tests/generics.rs at line 17 [4.1935]

B:BD[4.2237] → [4.2237:2312]

    compare_message(Greeting { name }, "Hello, Ferris!", langid!("en-US"))

[4.2237]

[4.2312]

    compare_message(Greeting { name }, "Hello, Ferris!", locale!("en-US"))

Replacement in fluent_embed_derive/tests/generics.rs at line 23 [4.1935]

B:BD[4.2355] → [4.2355:2434]

    compare_message(Greeting { name }, format!("Hello, 2!"), langid!("en-US"))

[4.2355]

[4.2434]

    compare_message(Greeting { name }, format!("Hello, 2!"), locale!("en-US"))

Replacement in fluent_embed_derive/tests/empty_fields.rs at line 7 [4.2477]
B:BD[4.2645] → [4.2645:2669]
```
use icu_locale::langid;
```
[4.2645]
[4.2669]
```
use icu_locale::locale;
```

Replacement in fluent_embed_derive/tests/empty_fields.rs at line 19 [4.2477]

B:BD[4.2833] → [4.2833:2897]

    compare_message(Message, "Hello, world!", langid!("en-US"))

[4.2833]

[4.2897]

    compare_message(Message, "Hello, world!", locale!("en-US"))

Replacement in fluent_embed_derive/tests/empty_fields.rs at line 24 [4.2477]

B:BD[4.2928] → [4.2928:2999]

    compare_message(Empty::Message, "Hello, world!", langid!("en-US"))

[4.2928]

[4.2999]

    compare_message(Empty::Message, "Hello, world!", locale!("en-US"))

Replacement in fluent_embed_derive/tests/common/mod.rs at line 2 [4.3053]
B:BD[4.3082] → [4.3082:3118]
```
use icu_locale::LanguageIdentifier;
```
[4.3082]
[4.3118]
```
use icu_locale::Locale;
```

Replacement in fluent_embed_derive/tests/common/mod.rs at line 4 [4.3053]

B:BD[4.3119] → [13.0:52]

∅:D[13.52] → [4.3180:3249]

B:BD[4.3180] → [4.3180:3249]

pub fn compare_message<L: Localize, S: AsRef<str>>(
    message: L,
    expected: S,
    locale: LanguageIdentifier,
) {

[4.3119]

[14.1028]

pub fn compare_message<L: Localize, S: AsRef<str>>(message: L, expected: S, locale: Locale) {

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 171 [8.76]

B:BD[13.282] → [15.236:398]

            fn canonical_locale(&self) -> ::fluent_embed::icu_locale::LanguageIdentifier {
                ::fluent_embed::icu_locale::langid!(#canonical_locale)

[13.282]

[15.398]

            fn canonical_locale(&self) -> ::fluent_embed::icu_locale::Locale {
                ::fluent_embed::icu_locale::locale!(#canonical_locale)

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 175 [8.76]

B:BD[8.1714] → [5.255:352]

            fn available_locales(&self) -> Vec<::fluent_embed::icu_locale::LanguageIdentifier> {

[8.1714]

[16.383]

            fn available_locales(&self) -> Vec<::fluent_embed::icu_locale::Locale> {

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 181 [8.76]

B:BD[16.509] → [5.353:426]

                locale: &::fluent_embed::icu_locale::LanguageIdentifier,

[16.477]

[14.1177]

                locale: &::fluent_embed::icu_locale::Locale,

Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 87 [18.39]

B:BD[17.1776] → [15.413:503]

    quote!(vec![self.canonical_locale(), #(::fluent_embed::langid!(#locale_literals)),*])

[17.1776]

[17.1841]

    quote!(vec![self.canonical_locale(), #(::fluent_embed::locale!(#locale_literals)),*])

Replacement in fluent_embed_derive/src/lib.rs at line 17 [20.74]
B:BD[8.5365] → [19.3445:3458]
```
            
```
[8.5365]
[19.3458]

Replacement in fluent_embed_derive/src/lib.rs at line 28 [20.74]

B:BD[19.3721] → [2.54:128]

                .write_to_out_dir(token_stream)
                .unwrap()

[19.3721]

[8.5450]

                    .write_to_out_dir(token_stream)
                    .unwrap()

Replacement in fluent_embed_derive/src/lib.rs at line 44 [20.74]
B:BD[21.2362] → [21.2362:2371]
```
        
```
[21.2362]
[13.338]

Deletion in fluent_embed_derive/src/lib.rs at line 46 [20.74]

B:BD[13.405] → [15.504:718]

∅:D[15.718] → [22.574:583]

∅:D[21.2641] → [22.574:583]

B:BD[22.574] → [22.574:583]

B:BD[22.583] → [21.2642:2886]

                            fn canonical_locale(&self) -> ::fluent_embed::icu_locale::LanguageIdentifier {
                                ::fluent_embed::icu_locale::langid!("en-US")
                            }
        
                            fn available_locales(&self) -> Vec<::fluent_embed::icu_locale::LanguageIdentifier> {
                                unimplemented!("Encountered error in derive macro")
                            }

Replacement in fluent_embed_derive/src/lib.rs at line 48 [20.74]

B:BD[21.3024] → [21.3024:3113]

                                locale: &::fluent_embed::icu_locale::LanguageIdentifier,

[21.2976]

[14.1404]

                                locale: &::fluent_embed::icu_locale::Locale,

Replacement in fluent_embed_derive/src/lib.rs at line 54 [20.74]
B:BD[8.5945] → [21.3335:3354]
```
                },
```
[8.5945]
[21.3354]
```
                }
```
Deletion in fluent_embed_derive/src/lib.rs at line 58 [20.74]
B:BD[8.5977] → [21.3506:3519]
```
            
```
Deletion in fluent_embed_derive/src/lib.rs at line 62 [20.74]
B:BD[23.951] → [22.852:853]
Replacement in fluent_embed/src/time.rs at line 7 [24.53]
B:BD[24.221] → [15.719:755]
```
use icu_locale::LanguageIdentifier;
```
[24.221]
[14.1767]
```
use icu_locale::Locale;
```

Replacement in fluent_embed/src/time.rs at line 16 [24.53]

B:BD[25.125] → [14.1822:1896]

    fn message_for_locale(&self, locale: &LanguageIdentifier) -> String {

[13.507]

[24.990]

    fn message_for_locale(&self, locale: &Locale) -> String {

Replacement in fluent_embed/src/string.rs at line 6 [26.34]
B:BD[26.139] → [15.756:792]
```
use icu_locale::LanguageIdentifier;
```
[26.139]
[26.215]
```
use icu_locale::Locale;
```

Replacement in fluent_embed/src/string.rs at line 11 [26.34]

B:BD[26.639] → [27.391:474]

            fn message_for_locale(&self, _locale: &LanguageIdentifier) -> String {

[27.95]

[27.474]

            fn message_for_locale(&self, _locale: &Locale) -> String {

Replacement in fluent_embed/src/lib.rs at line 9 [29.82]

B:BD[5.2736] → [28.0:56]

pub use icu_locale::{self, LanguageIdentifier, langid};

[5.2736]

[5.2792]

pub use icu_locale::{self, Locale, locale};

Replacement in fluent_embed/src/lib.rs at line 18 [29.82]

B:BD[13.730] → [15.793:866]

    fn message_for_locale(&self, locale: &LanguageIdentifier) -> String;

[13.730]

[15.866]

    fn message_for_locale(&self, locale: &Locale) -> String;

Replacement in fluent_embed/src/lib.rs at line 20 [29.82]

B:BD[15.867] → [15.867:947]

    fn canonical_locale(&self) -> LanguageIdentifier {
        langid!("en-US")

[15.867]

[15.947]

    fn canonical_locale(&self) -> Locale {
        locale!("en-US")

Replacement in fluent_embed/src/lib.rs at line 24 [29.82]

B:BD[29.512] → [15.954:1015]

    fn available_locales(&self) -> Vec<LanguageIdentifier> {

[29.512]

[15.1015]

    fn available_locales(&self) -> Vec<Locale> {

Replacement in fluent_embed/src/lib.rs at line 31 [29.82]

B:BD[14.2219] → [15.1143:1241]

∅:D[15.1241] → [30.460:737]

∅:D[14.2316] → [30.460:737]

B:BD[30.460] → [30.460:737]

B:BD[30.737] → [3.0:68]

            env_preferences::get_locales_lossy().unwrap_or(vec![self.canonical_locale().into()]);
        // Lossily convert from a Locale to LanguageIdentifier for Fluent language negotiation
        let system_langids = system_locales
            .into_iter()
            .map(|icu_locale| icu_locale.id)
            .collect::<Vec<icu_locale_core::LanguageIdentifier>>();
        let requested_locales = old_locale_version(system_langids);

[14.2219]

[3.68]

            env_preferences::get_locales_lossy().unwrap_or(vec![self.canonical_locale()]);
        let requested_locales = old_locale_version(system_locales);

Replacement in fluent_embed/src/lib.rs at line 34 [29.82]

∅:D[3.146] → [5.3605:3683]

B:BD[5.3605] → [5.3605:3683]

B:BD[5.3683] → [15.1242:1302]

∅:D[15.1302] → [5.3742:3771]

B:BD[5.3742] → [5.3742:3771]

        let canonical_locale = icu_locid::LanguageIdentifier::try_from_bytes(
            self.canonical_locale().to_string().as_bytes(),
        )
        .unwrap();

[3.146]

[31.287]

        let canonical_locale =
            icu_locid::Locale::try_from_bytes(self.canonical_locale().to_string().as_bytes())
                .unwrap();

Replacement in fluent_embed/src/lib.rs at line 45 [29.82]

∅:D[32.482] → [5.3772:3805]

B:BD[16.5246] → [5.3772:3805]

∅:D[32.508] → [5.3825:3914]

B:BD[5.3825] → [5.3825:3914]

B:BD[5.3914] → [14.2317:2327]

        self.message_for_locale(
            &LanguageIdentifier::try_from_str(&selected_locale[0].to_string()).unwrap(),
        )

[32.445]

[16.5304]

        self.message_for_locale(&Locale::try_from_str(&selected_locale[0].to_string()).unwrap())

Replacement in fluent_embed/src/lib.rs at line 50 [29.82]

B:BD[3.176] → [3.176:300]

fn old_locale_version(
    new_locales: Vec<icu_locale_core::LanguageIdentifier>,
) -> Vec<icu_locid::LanguageIdentifier> {

[3.176]

[3.300]

fn old_locale_version(new_locales: Vec<icu_locale_core::Locale>) -> Vec<icu_locid::Locale> {

Replacement in fluent_embed/src/lib.rs at line 53 [29.82]

B:BD[3.337] → [3.337:413]

        // Convert new `icu_locale::LanguageIdentifier` to canonical string

[3.337]

[3.413]

        // Convert new `icu_locale::Locale` to canonical string

Replacement in fluent_embed/src/lib.rs at line 56 [29.82]

B:BD[3.539] → [3.539:635]

        .map(|icu_langid| icu_locid::LanguageIdentifier::try_from_bytes(icu_langid.as_bytes()))

[3.539]

[3.635]

        .map(|icu_langid| icu_locid::Locale::try_from_bytes(icu_langid.as_bytes()))

Replacement in fluent_embed/src/decimal.rs at line 8 [33.2537]
B:BD[27.846] → [15.1303:1339]
```
use icu_locale::LanguageIdentifier;
```
[27.846]
[27.892]
```
use icu_locale::Locale;
```

Replacement in fluent_embed/src/decimal.rs at line 13 [33.2537]

B:BD[33.2825] → [27.1287:1369]

            fn message_for_locale(&self, locale: &LanguageIdentifier) -> String {

[27.991]

[27.1369]

            fn message_for_locale(&self, locale: &Locale) -> String {

Replacement in fluent_embed/src/decimal.rs at line 24 [33.2537]

B:BD[33.4036] → [27.1910:1992]

            fn message_for_locale(&self, locale: &LanguageIdentifier) -> String {

[27.1614]

[27.1992]

            fn message_for_locale(&self, locale: &Locale) -> String {

Replacement in fluent_embed/src/decimal.rs at line 50 [33.2537]

B:BD[33.4621] → [27.2497:2571]

    fn message_for_locale(&self, locale: &LanguageIdentifier) -> String {

[13.1016]

[33.4824]

    fn message_for_locale(&self, locale: &Locale) -> String {

Use full `Locale` instead of `LanguageIdentifier` subset

Dependencies

In channels

Change contents

Replacement in fluent_embed_derive/tests/selectors.rs at line 7 [6.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 17 [6.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 21 [6.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 25 [6.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 30 [6.140]

Replacement in fluent_embed_derive/tests/recursive.rs at line 7 [4.164]

Replacement in fluent_embed_derive/tests/recursive.rs at line 32 [4.164]

Replacement in fluent_embed_derive/tests/recursive.rs at line 46 [4.164]

Replacement in fluent_embed_derive/tests/placeables.rs at line 7 [12.38]

Replacement in fluent_embed_derive/tests/placeables.rs at line 25 [12.38]

Replacement in fluent_embed_derive/tests/placeables.rs at line 39 [12.38]

Replacement in fluent_embed_derive/tests/placeables.rs at line 54 [12.38]

Replacement in fluent_embed_derive/tests/lifetimes.rs at line 7 [4.1286]

Replacement in fluent_embed_derive/tests/lifetimes.rs at line 20 [4.1286]

Replacement in fluent_embed_derive/tests/lifetimes.rs at line 30 [4.1286]

Replacement in fluent_embed_derive/tests/generics.rs at line 7 [4.1935]