finchie/cli_framework - Change C6W7N6N57UCNHEV55HEZ3G7WN2ZOBGMFBB5M5ZPDB2HNNHHTOPBQC

Implement `Localize` for `FixedDecimal` and primitive number types

Simple implementation that wraps a call to icu_decimal::FixedDecimalFormatter, along with implementations for primitive number types such as isize, u32, f64, etc.

Created by finchie on August 26, 2024

C6W7N6N57UCNHEV55HEZ3G7WN2ZOBGMFBB5M5ZPDB2HNNHHTOPBQC

Dependencies

In channels

main

Change contents

Replacement in fluent_embed_derive/tests/selectors.rs at line 14 [5.140]
∅:D[2.130] → [4.124:181]
B:BD[4.124] → [4.124:181]
```
    fn expected_message(&self, locale: &str) -> String {
```
[2.130]
[4.181]
```
    fn expected_plural(&self, locale: &str) -> String {
```

Replacement in fluent_embed_derive/tests/selectors.rs at line 18 [5.140]

B:BD[4.312] → [4.312:562]

                    // Only 1 is singular
                    1 => format!("You have {unread_emails} unread email."),
                    // Everything else is plural
                    0 | 2.. => format!("You have {unread_emails} unread emails."),

[4.312]

[4.562]

                    0..=999 => unread_emails.to_string(),
                    &u64::MAX => "18,446,744,073,709,551,615".to_string(),
                    _ => unreachable!(),

Replacement in fluent_embed_derive/tests/selectors.rs at line 23 [5.140]

B:BD[4.627] → [4.627:887]

                    // Both 0 & 1 are singular
                    0 | 1 => format!("Vous avez {unread_emails} e-mail non lu."),
                    // Everything else is plural
                    2.. => format!("Vous avez {unread_emails} e-mails non lus."),

[4.627]

[4.887]

                    0..=999 => unread_emails.to_string(),
                    &u64::MAX => "18 446 744 073 709 551 615".to_string(),
                    _ => unreachable!(),

Insertion in fluent_embed_derive/tests/selectors.rs at line 29 [5.140]

[4.958]

        }
    }
    fn expected_message(&self, locale: &str) -> String {
        match self {
            Self::Emails { unread_emails } => {
                let expected_plural = self.expected_plural(locale);
                match locale {
                    "en-US" => match unread_emails {
                        // Only 1 is singular
                        1 => "You have 1 unread email.".to_string(),
                        // Everything else is plural
                        0 | 2.. => format!("You have {expected_plural} unread emails."),
                    },
                    "fr" => match unread_emails {
                        // Both 0 & 1 are singular
                        0 | 1 => format!("Vous avez {expected_plural} e-mail non lu."),
                        // Everything else is plural
                        2.. => format!("Vous avez {expected_plural} e-mails non lus."),
                    },
                    _ => unreachable!(),
                }
            }

Replacement in fluent_embed_derive/tests/selectors.rs at line 67 [5.140]

B:BD[3.33] → [3.33:89]

    data.message_for_locale(&mut buffer, &language_id);

[3.33]

[3.89]

    data.message_for_locale(&mut buffer, &language_id).unwrap();

Insertion in fluent_embed_derive/src/fluent/ast.rs at line 6 [8.33]
[6.2217]
[7.5591]
```
use fixed_decimal::{FixedDecimal, FloatPrecision};
```

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 62 [8.33]

B:BD[6.3664] → [3.2705:2782]

                            match plural_rules.category_for(#match_target) {

[6.3664]

[3.2782]

                            match plural_rules.category_for(*#match_target) {

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 70 [8.33]

B:BD[3.2973] → [3.2973:3042]

                        parse_quote!(writer.write_all(#expression)?)

[3.2973]

[6.3995]

                        parse_quote!(#expression.message_for_locale(writer, locale)?)

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 94 [8.33]

B:BD[8.2001] → [8.2001:2330]

            // FIXME: i128 is "good enough" for now but an incorrect representation!
            // e.g. decimals not supported
            let parsed_value = i128::from_str_radix(value, 10).unwrap();
            let number_literal = proc_macro2::Literal::i128_unsuffixed(parsed_value);
            parse_quote!(#number_literal)

[8.2001]

[8.2330]

            let parsed_value: f64 = value.parse().unwrap();
            // Check validity at compile-time, so we avoid generating code that will break at runtime
            assert!(FixedDecimal::try_from_f64(parsed_value, FloatPrecision::Floating).is_ok());
            let float_literal = proc_macro2::Literal::f64_suffixed(parsed_value);
            parse_quote!(::fluent_embed::FixedDecimal::try_from_f64(#float_literal, ::fluent_embed::FloatPrecision::Floating).unwrap())

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 141 [8.33]

∅:D[6.6063] → [9.3783:3850]

∅:D[10.9149] → [9.3783:3850]

B:BD[9.3783] → [9.3783:3850]

B:BD[9.3850] → [3.3639:3723]

                ReferenceKind::EnumField => parse_quote!(*#ident),
                ReferenceKind::StructField => parse_quote!(message_context.#ident),

[10.9149]

[9.3923]

                ReferenceKind::EnumField => parse_quote!(#ident),
                ReferenceKind::StructField => parse_quote!(self.#ident),

Insertion in fluent_embed_derive/Cargo.toml at line 13 [11.1300]
[11.1410]
[6.9101]
```
fixed_decimal = { version = "0.5.6", features = ["ryu"] }
```
Insertion in fluent_embed_derive/Cargo.toml at line 27 [11.1300]
[12.820]
[13.411]
```
icu_decimal = "1.5.0"
icu_provider = "1.5.0"
```
Insertion in fluent_embed/src/lib.rs at line 8 [14.82]
[14.269]
[14.269]
```
pub use fixed_decimal::{FixedDecimal, FloatPrecision};
```
Insertion in fluent_embed/src/lib.rs at line 14 [14.82]
[15.4362]
[15.4362]
```
pub mod decimal;
```

File addition: decimal.rs (----------)

[14.49]

use crate::Localize;
use duplicate::duplicate_item;
use fixed_decimal::{FixedDecimal, FloatPrecision};
use icu_decimal::{options::FixedDecimalFormatterOptions, FixedDecimalFormatter};
use icu_locid::{langid, LanguageIdentifier};
use icu_provider::DataLocale;
use writeable::Writeable;
// Implementations of `Localize` for all primitive number types
// These just convert to a `FixedDecimal` and then use its implementation
#[duplicate_item(
    type_name conversion;
    [u8]      [FixedDecimal::from(*self)];
    [u16]     [FixedDecimal::from(*self)];
    [u32]     [FixedDecimal::from(*self)];
    [u64]     [FixedDecimal::from(*self)];
    [u128]    [FixedDecimal::from(*self)];
    [usize]   [FixedDecimal::from(*self)];
    
    [i8]      [FixedDecimal::from(*self)];
    [i16]     [FixedDecimal::from(*self)];
    [i32]     [FixedDecimal::from(*self)];
    [i64]     [FixedDecimal::from(*self)];
    [i128]    [FixedDecimal::from(*self)];
    [isize]   [FixedDecimal::from(*self)];
    [f32]     [FixedDecimal::try_from_f64(*self as f64, FloatPrecision::Floating).unwrap()];
    [f64]     [FixedDecimal::try_from_f64(*self, FloatPrecision::Floating).unwrap()];
)]
impl<W: std::io::Write> Localize<W> for type_name {
    const CANONICAL_LOCALE: LanguageIdentifier = langid!("en-US");
    fn available_locales(&self) -> Vec<LanguageIdentifier> {
        // TODO: keep track of all locales with Fluent data, and return only those
        vec![<Self as Localize<W>>::CANONICAL_LOCALE]
    }
    fn message_for_locale(
        &self,
        writer: &mut W,
        locale: &LanguageIdentifier,
    ) -> Result<(), crate::LocalizationError> {
        let fixed_decimal = conversion;
        fixed_decimal.message_for_locale(writer, locale)
    }
}
impl<W: std::io::Write> Localize<W> for FixedDecimal {
    const CANONICAL_LOCALE: LanguageIdentifier = langid!("en-US");
    fn available_locales(&self) -> Vec<LanguageIdentifier> {
        // TODO: keep track of all locales with Fluent data, and return only those
        vec![<Self as Localize<W>>::CANONICAL_LOCALE]
    }
    fn message_for_locale(
        &self,
        writer: &mut W,
        locale: &LanguageIdentifier,
    ) -> Result<(), crate::LocalizationError> {
        let data_locale = DataLocale::from(locale);
        let formatter =
            FixedDecimalFormatter::try_new(&data_locale, FixedDecimalFormatterOptions::default())
                .unwrap();
        let formatted_decimal = formatter.format(self);
        writer.write_all(formatted_decimal.write_to_string().as_bytes())?;
        Ok(())
    }
}

Insertion in fluent_embed/Cargo.toml at line 10 [14.1078]
[14.1196]
[15.4377]
```
duplicate = "1.0.0"
```
Insertion in fluent_embed/Cargo.toml at line 13 [14.1078]
[3.5369]
[15.4435]
```
icu_decimal = "1.5.0"
```

Insertion in Cargo.lock at line 121 [17.4277]

[16.1773]

name = "duplicate"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb"
dependencies = [
 "heck",
 "proc-macro-error",
]
[[package]]

Insertion in Cargo.lock at line 187 [17.4277]
[11.1925]
[12.1075]
```
 "duplicate",
```
Insertion in Cargo.lock at line 190 [17.4277]
[12.1117]
[12.1117]
```
 "icu_decimal",
```
Insertion in Cargo.lock at line 205 [17.4277]
[12.1291]
[11.1925]
```
 "fixed_decimal",
```
Insertion in Cargo.lock at line 209 [17.4277]
[11.1952]
[18.575]
```
 "icu_decimal",
```
Insertion in Cargo.lock at line 211 [17.4277]
[18.589]
[6.15009]
```
 "icu_provider",
```

Implement `Localize` for `FixedDecimal` and primitive number types

Dependencies

In channels

Change contents

Replacement in fluent_embed_derive/tests/selectors.rs at line 14 [5.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 18 [5.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 23 [5.140]

Insertion in fluent_embed_derive/tests/selectors.rs at line 29 [5.140]

Replacement in fluent_embed_derive/tests/selectors.rs at line 67 [5.140]

Insertion in fluent_embed_derive/src/fluent/ast.rs at line 6 [8.33]

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 62 [8.33]

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 70 [8.33]

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 94 [8.33]

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 141 [8.33]

Insertion in fluent_embed_derive/Cargo.toml at line 13 [11.1300]

Insertion in fluent_embed_derive/Cargo.toml at line 27 [11.1300]

Insertion in fluent_embed/src/lib.rs at line 8 [14.82]

Insertion in fluent_embed/src/lib.rs at line 14 [14.82]

File addition: decimal.rs (----------)

Insertion in fluent_embed/Cargo.toml at line 10 [14.1078]

Insertion in fluent_embed/Cargo.toml at line 13 [14.1078]

Insertion in Cargo.lock at line 121 [17.4277]

Insertion in Cargo.lock at line 187 [17.4277]

Insertion in Cargo.lock at line 190 [17.4277]

Insertion in Cargo.lock at line 205 [17.4277]

Insertion in Cargo.lock at line 209 [17.4277]

Insertion in Cargo.lock at line 211 [17.4277]