finchie/l10n_embed - Change QJC4IQITOQP65AFLA5CMH2EXHB6B3SOLW2XBV72U5ZQU2KOR2EIAC

Refactor `Localize` functions to infallibly return `String`

Removes unnecessary complexity that was creating error cases, allowing localize() and message_for_locale() to be infallible. The std::io::Write writer was removed as it just ended up causing more difficulty than what was really worth dealing with, for little (if any) actual gains.

Created by finchie on June 4, 2025

QJC4IQITOQP65AFLA5CMH2EXHB6B3SOLW2XBV72U5ZQU2KOR2EIAC

Dependencies

In channels

main

Change contents

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 3 [5.109]
B:BD[5.258] → [5.258:307]
```
use fluent_embed::{LocalizationError, Localize};
```
[5.258]
[5.307]
```
use fluent_embed::Localize;
```

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 17 [5.109]

B:BD[5.534] → [5.534:629]

    pub fn with_items<L: Localize>(mut self, items: &[L]) -> Result<Self, LocalizationError> {

[5.534]

[5.629]

    pub fn with_items<L: Localize>(mut self, items: &[L]) -> Self {

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 21 [5.109]
∅:D[4.37] → [5.1013:1080]
B:BD[5.1013] → [5.1013:1080]
```
            .collect::<Result<Vec<String>, LocalizationError>>()?;
```
[4.37]
[5.1080]
```
            .collect::<Vec<String>>();
```
Replacement in fluent_embed_interaction/src/prompt/select.rs at line 24 [5.109]
B:BD[5.1125] → [5.1125:1142]
```
        Ok(self)
```
[5.1125]
[5.1142]
```
        self
```
Replacement in fluent_embed_interaction/src/prompt/password.rs at line 3 [5.2012]
B:BD[5.2163] → [5.2163:2212]
```
use fluent_embed::{LocalizationError, Localize};
```
[5.2163]
[5.2212]
```
use fluent_embed::Localize;
```

Replacement in fluent_embed_interaction/src/prompt/password.rs at line 26 [5.2012]

B:BD[5.2710] → [5.2710:2753]

B:BD[5.2753] → [4.38:158]

    ) -> Result<Self, LocalizationError> {
        let confirmation_text = confirmation.localize()?;
        let mismatch_error_text = mismatch_error.localize()?;

[5.2710]

[5.2895]

    ) -> Self {
        let confirmation_text = confirmation.localize();
        let mismatch_error_text = mismatch_error.localize();

Replacement in fluent_embed_interaction/src/prompt/password.rs at line 35 [5.2012]
B:BD[5.3200] → [5.3200:3217]
```
        Ok(self)
```
[5.3200]
[5.3217]
```
        self
```

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 25 [5.4406]

B:BD[5.4938] → [5.4938:5087]

B:BD[5.5087] → [4.159:216]

            pub fn with_prompt<L: Localize>(
                mut self,
                prompt: L,
            ) -> Result<Self, LocalizationError> {
                let localized_text = prompt.localize()?;

[5.4938]

[5.5244]

            pub fn with_prompt<L: fluent_embed::Localize>(mut self, prompt: L) -> Self {
                let localized_text = prompt.localize();

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 29 [5.4406]
B:BD[5.5297] → [5.5297:5322]
```
                Ok(self)
```
[5.5297]
[5.5322]
```
                self
```

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 38 [5.4406]

B:BD[5.5441] → [5.5441:5532]

            pub fn with_validator<L: Localize, V: Fn(&String) -> Result<(), L> + 'static>(

[5.5441]

[5.5532]

            pub fn with_validator<
                L: fluent_embed::Localize,
                V: Fn(&String) -> Result<(), L> + 'static,
            >(

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 50 [5.4406]

B:BD[5.5892] → [4.217:278]

                            Err(message.localize().unwrap())

[5.5892]

[5.6188]

                            Err(message.localize())

Replacement in fluent_embed_interaction/src/prompt/input.rs at line 3 [5.6488]
B:BD[5.6639] → [5.6639:6688]
```
use fluent_embed::{LocalizationError, Localize};
```
[5.6639]
[5.6688]
```
use fluent_embed::Localize;
```

Replacement in fluent_embed_interaction/src/prompt/input.rs at line 17 [5.6488]

B:BD[5.6941] → [5.6941:7037]

B:BD[5.7037] → [4.279:329]

    pub fn with_default<L: Localize>(mut self, default: L) -> Result<Self, LocalizationError> {
        let localized_text = default.localize()?;

[5.6941]

[5.7171]

    pub fn with_default<L: Localize>(mut self, default: L) -> Self {
        let localized_text = default.localize();

Replacement in fluent_embed_interaction/src/prompt/input.rs at line 21 [5.6488]
B:BD[5.7217] → [5.7217:7234]
```
        Ok(self)
```
[5.7217]
[5.7234]
```
        self
```
Deletion in fluent_embed_interaction/src/prompt/confirm.rs at line 3 [5.8140]
B:BD[5.8289] → [5.8289:8338]
```
use fluent_embed::{LocalizationError, Localize};
```
Replacement in fluent_embed_interaction/src/progress.rs at line 2 [6.513]
B:BD[6.549] → [6.549:598]
```
use fluent_embed::{LocalizationError, Localize};
```
[6.549]
[6.598]
```
use fluent_embed::Localize;
```

Replacement in fluent_embed_interaction/src/progress.rs at line 25 [6.513]

B:BD[6.1231] → [6.1231:1327]

B:BD[6.1327] → [4.330:380]

    pub fn with_message<L: Localize>(mut self, message: L) -> Result<Self, LocalizationError> {
        let localized_text = message.localize()?;

[6.1231]

[6.1461]

    pub fn with_message<L: Localize>(mut self, message: L) -> Self {
        let localized_text = message.localize();

Replacement in fluent_embed_interaction/src/progress.rs at line 29 [6.513]
B:BD[6.1538] → [6.1538:1555]
```
        Ok(self)
```
[6.1538]
[6.1555]
```
        self
```

Replacement in fluent_embed_derive/tests/common/mod.rs at line 9 [7.3053]

B:BD[7.3249] → [7.3249:3399]

    let mut buffer = Vec::new();
    message.message_for_locale(&mut buffer, &locale).unwrap();
    let result = String::from_utf8(buffer).unwrap();

[7.3249]

[7.3399]

    let result = message.message_for_locale(&locale);

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 87 [9.76]
B:BD[8.564] → [8.564:580]
```
            }))
```
[8.564]
[8.580]
```
            }));
```
Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 100 [9.76]
B:BD[8.790] → [8.790:806]
```
            }))
```
[8.790]
[8.806]
```
            }));
```
Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 121 [9.76]
B:BD[8.1022] → [8.1022:1042]
```
                }))
```
[8.1022]
[8.1042]
```
                }));
```
Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 178 [9.76]
B:BD[9.1868] → [10.283:337]
```
            fn message_for_locale<W: std::io::Write>(
```
[9.1868]
[11.454]
```
            fn message_for_locale(
```
Deletion in fluent_embed_derive/src/macro_impl/mod.rs at line 180 [9.76]
B:BD[11.477] → [11.477:509]
```
                writer: &mut W,
```
Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 181 [9.76]
∅:D[12.426] → [11.581:646]
B:BD[11.581] → [11.581:646]
```
            ) -> Result<(), ::fluent_embed::LocalizationError> {
```
[12.426]
[11.646]
```
            ) -> String {
```
Insertion in fluent_embed_derive/src/macro_impl/derive.rs at line 41 [15.39]
[13.510]
[14.903]
```
        let mut buffer = String::new();
```
Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 53 [15.39]
B:BD[11.768] → [11.768:795]
```
            return Ok(());
```
[11.768]
[11.795]
```
            return buffer;
```
Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 58 [15.39]
B:BD[11.814] → [11.814:829]
```
        Ok(())
```
[11.814]
[13.511]
```
        buffer
```
Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 111 [15.39]
B:BD[8.2575] → [8.2575:2591]
```
            }))
```
[8.2575]
[8.2591]
```
            }));
```
Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 167 [15.39]
B:BD[8.2906] → [8.2906:2926]
```
                }))
```
[8.2906]
[8.2926]
```
                }));
```
Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 184 [15.39]
B:BD[8.3146] → [8.3146:3166]
```
                }))
```
[8.3146]
[8.3166]
```
                }));
```

Replacement in fluent_embed_derive/src/lib.rs at line 53 [17.74]

B:BD[16.2886] → [10.406:476]

                            fn message_for_locale<W: std::io::Write>(

[16.2886]

[16.2937]

                            fn message_for_locale(

Deletion in fluent_embed_derive/src/lib.rs at line 55 [17.74]
B:BD[16.2976] → [16.2976:3024]
```
                                writer: &mut W,
```

Replacement in fluent_embed_derive/src/lib.rs at line 56 [17.74]

B:BD[16.3113] → [16.3113:3194]

                            ) -> Result<(), ::fluent_embed::LocalizationError> {

[16.3113]

[16.3194]

                            ) -> String {

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 20 [18.33]

∅:D[2.898] → [11.1029:1219]

B:BD[11.1029] → [11.1029:1219]

                let byte_string_literal = proc_macro2::Literal::byte_string(value.as_bytes());
                write_expressions.push(parse_quote!(writer.write_all(#byte_string_literal)?));

[2.898]

[11.1219]

                write_expressions.push(parse_quote!(buffer.push_str(#value)));

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 72 [18.33]

B:BD[11.2973] → [19.1617:1703]

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

[11.2973]

[13.3995]

                        parse_quote!(buffer.push_str(&#expression.message_for_locale(locale)))

Replacement in fluent_embed/src/time.rs at line 1 [20.53]
B:BD[20.53] → [11.3724:3766]
```
use crate::{LocalizationError, Localize};
```
[20.53]
[21.21]
```
use crate::Localize;
```

Replacement in fluent_embed/src/time.rs at line 5 [20.53]

B:BD[20.143] → [20.143:218]

    options::Numeric, RelativeTimeFormatter, RelativeTimeFormatterOptions,

[20.143]

[20.218]

    RelativeTimeFormatter, RelativeTimeFormatterOptions, options::Numeric,

Replacement in fluent_embed/src/time.rs at line 7 [20.53]

B:BD[20.221] → [12.1523:1569]

∅:D[12.1569] → [20.296:350]

B:BD[20.296] → [20.296:350]

use icu_locale::{langid, LanguageIdentifier};
use jiff::{tz::TimeZone, SpanRound, Timestamp, Unit};

[20.221]

[20.350]

use icu_locale::{LanguageIdentifier, langid};
use jiff::{SpanRound, Timestamp, Unit, tz::TimeZone};

Replacement in fluent_embed/src/time.rs at line 23 [20.53]

B:BD[21.125] → [10.546:592]

∅:D[10.592] → [11.4149:4266]

B:BD[11.4149] → [11.4149:4266]

    fn message_for_locale<W: std::io::Write>(
        &self,
        writer: &mut W,
        locale: &LanguageIdentifier,
    ) -> Result<(), LocalizationError> {

[21.125]

[20.990]

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

Replacement in fluent_embed/src/time.rs at line 108 [20.53]
B:BD[11.4323] → [11.4323:4324]
B:BD[11.4324] → [12.2572:2638]
∅:D[12.2638] → [11.4396:4421]
B:BD[11.4396] → [11.4396:4421]
∅:D[11.4421] → [21.249:250]
B:BD[20.4358] → [21.249:250]
B:BD[21.250] → [11.4422:4437]
```
        writer.write_all(formatted_text.to_string().as_bytes())?;
        writer.flush()?;
        Ok(())
```
[11.4323]
[21.394]
```
        formatted_text.to_string()
```
Replacement in fluent_embed/src/string.rs at line 7 [22.34]
B:BD[22.170] → [12.2639:2685]
```
use icu_locale::{langid, LanguageIdentifier};
```
[22.170]
[22.215]
```
use icu_locale::{LanguageIdentifier, langid};
```

Replacement in fluent_embed/src/string.rs at line 24 [22.34]

B:BD[22.639] → [10.662:708]

∅:D[10.708] → [22.666:850]

B:BD[22.666] → [22.666:850]

    fn message_for_locale<W: std::io::Write>(
        &self,
        writer: &mut W,
        _locale: &LanguageIdentifier,
    ) -> Result<(), crate::LocalizationError> {
        writer.write_all(self.as_bytes())?;
        Ok(())

[22.639]

[22.850]

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

Deletion in fluent_embed/src/lib.rs at line 17 [23.82]

B:BD[23.406] → [11.4438:4502]

B:BD[11.4561] → [11.4561:4642]

B:BD[11.4642] → [24.0:100]

B:BD[24.100] → [3.57:213]

∅:D[24.100] → [11.4642:4645]

∅:D[3.213] → [11.4642:4645]

B:BD[11.4642] → [11.4642:4645]

#[derive(thiserror::Error, Debug)]
pub enum LocalizationError {
    #[error("unable to write localized output")]
    IO(#[from] std::io::Error),
    #[error("unable to retrieve system locales")]
    RetrievalError(env_preferences::LocaleError),
    #[error("unable to parse localized output as a UTF-8 string. This is a bug in `fluent_embed`.")]
    InvalidOutput(#[from] std::string::FromUtf8Error),
}

Replacement in fluent_embed/src/lib.rs at line 22 [23.82]

B:BD[11.4813] → [10.731:777]

∅:D[10.777] → [11.4840:4956]

B:BD[11.4840] → [11.4840:4956]

    fn message_for_locale<W: std::io::Write>(
        &self,
        writer: &mut W,
        locale: &LanguageIdentifier,
    ) -> Result<(), LocalizationError>;

[11.4813]

[11.4956]

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

Replacement in fluent_embed/src/lib.rs at line 38 [23.82]

B:BD[12.3447] → [4.381:443]

∅:D[4.443] → [24.321:460]

∅:D[10.871] → [24.321:460]

B:BD[11.5031] → [24.321:460]

    fn localize(&self) -> Result<String, LocalizationError> {
        let system_locales = env_preferences::get_locales_lossy()
            .map_err(|error| LocalizationError::RetrievalError(error))?;

[12.3447]

[24.460]

    fn localize(&self) -> String {
        let system_locales =
            env_preferences::get_locales_lossy().unwrap_or(vec![Self::CANONICAL_LOCALE.into()]);

Deletion in fluent_embed/src/lib.rs at line 60 [23.82]
B:BD[4.445] → [4.445:482]
```
        let mut buffer = Vec::new();
```
Deletion in fluent_embed/src/lib.rs at line 61 [23.82]
B:BD[12.3805] → [4.483:508]
```
            &mut buffer,
```

Replacement in fluent_embed/src/lib.rs at line 62 [23.82]

B:BD[12.3914] → [4.509:606]

        )?;
        let localized_text = String::from_utf8(buffer)?;
        Ok(localized_text)

[12.3914]

[11.5304]

Replacement in fluent_embed/src/decimal.rs at line 37 [19.2537]
B:BD[19.4036] → [10.941:987]
```
    fn message_for_locale<W: std::io::Write>(
```
[19.4036]
[19.4063]
```
    fn message_for_locale(
```
Deletion in fluent_embed/src/decimal.rs at line 39 [19.2537]
B:BD[19.4078] → [19.4078:4102]
```
        writer: &mut W,
```
Replacement in fluent_embed/src/decimal.rs at line 40 [19.2537]
B:BD[19.4139] → [19.4139:4187]
```
    ) -> Result<(), crate::LocalizationError> {
```
[19.4139]
[19.4187]
```
    ) -> String {
```

Replacement in fluent_embed/src/decimal.rs at line 42 [19.2537]

B:BD[19.4227] → [19.4227:4284]

        fixed_decimal.message_for_locale(writer, locale)

[19.4227]

[19.4284]

        fixed_decimal.message_for_locale(locale)

Replacement in fluent_embed/src/decimal.rs at line 54 [19.2537]
B:BD[19.4621] → [10.1055:1101]
```
    fn message_for_locale<W: std::io::Write>(
```
[19.4621]
[19.4648]
```
    fn message_for_locale(
```
Deletion in fluent_embed/src/decimal.rs at line 56 [19.2537]
B:BD[19.4663] → [19.4663:4687]
```
        writer: &mut W,
```
Replacement in fluent_embed/src/decimal.rs at line 57 [19.2537]
B:BD[19.4724] → [19.4724:4772]
```
    ) -> Result<(), crate::LocalizationError> {
```
[19.4724]
[19.4824]
```
    ) -> String {
```
Replacement in fluent_embed/src/decimal.rs at line 63 [19.2537]
B:BD[19.5030] → [12.5079:5148]
∅:D[12.5148] → [19.5105:5120]
B:BD[19.5105] → [19.5105:5120]
```
        writer.write_all(formatted_decimal.to_string().as_bytes())?;
        Ok(())
```
[19.5030]
[19.5120]
```
        formatted_decimal.to_string()
```

Refactor `Localize` functions to infallibly return `String`

Dependencies

In channels

Change contents

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 3 [5.109]

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 17 [5.109]

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 21 [5.109]

Replacement in fluent_embed_interaction/src/prompt/select.rs at line 24 [5.109]

Replacement in fluent_embed_interaction/src/prompt/password.rs at line 3 [5.2012]

Replacement in fluent_embed_interaction/src/prompt/password.rs at line 26 [5.2012]

Replacement in fluent_embed_interaction/src/prompt/password.rs at line 35 [5.2012]

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 25 [5.4406]

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 29 [5.4406]

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 38 [5.4406]

Replacement in fluent_embed_interaction/src/prompt/macros.rs at line 50 [5.4406]

Replacement in fluent_embed_interaction/src/prompt/input.rs at line 3 [5.6488]

Replacement in fluent_embed_interaction/src/prompt/input.rs at line 17 [5.6488]

Replacement in fluent_embed_interaction/src/prompt/input.rs at line 21 [5.6488]

Deletion in fluent_embed_interaction/src/prompt/confirm.rs at line 3 [5.8140]

Replacement in fluent_embed_interaction/src/progress.rs at line 2 [6.513]

Replacement in fluent_embed_interaction/src/progress.rs at line 25 [6.513]

Replacement in fluent_embed_interaction/src/progress.rs at line 29 [6.513]

Replacement in fluent_embed_derive/tests/common/mod.rs at line 9 [7.3053]

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 87 [9.76]

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 100 [9.76]

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 121 [9.76]

Replacement in fluent_embed_derive/src/macro_impl/mod.rs at line 178 [9.76]

Deletion in fluent_embed_derive/src/macro_impl/mod.rs at line 180 [9.76]

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

Insertion in fluent_embed_derive/src/macro_impl/derive.rs at line 41 [15.39]

Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 53 [15.39]

Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 58 [15.39]

Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 111 [15.39]

Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 167 [15.39]

Replacement in fluent_embed_derive/src/macro_impl/derive.rs at line 184 [15.39]

Replacement in fluent_embed_derive/src/lib.rs at line 53 [17.74]

Deletion in fluent_embed_derive/src/lib.rs at line 55 [17.74]

Replacement in fluent_embed_derive/src/lib.rs at line 56 [17.74]

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 20 [18.33]

Replacement in fluent_embed_derive/src/fluent/ast.rs at line 72 [18.33]

Replacement in fluent_embed/src/time.rs at line 1 [20.53]

Replacement in fluent_embed/src/time.rs at line 5 [20.53]

Replacement in fluent_embed/src/time.rs at line 7 [20.53]

Replacement in fluent_embed/src/time.rs at line 23 [20.53]

Replacement in fluent_embed/src/time.rs at line 108 [20.53]

Replacement in fluent_embed/src/string.rs at line 7 [22.34]

Replacement in fluent_embed/src/string.rs at line 24 [22.34]

Deletion in fluent_embed/src/lib.rs at line 17 [23.82]

Replacement in fluent_embed/src/lib.rs at line 22 [23.82]

Replacement in fluent_embed/src/lib.rs at line 38 [23.82]

Deletion in fluent_embed/src/lib.rs at line 60 [23.82]

Deletion in fluent_embed/src/lib.rs at line 61 [23.82]

Replacement in fluent_embed/src/lib.rs at line 62 [23.82]

Replacement in fluent_embed/src/decimal.rs at line 37 [19.2537]

Deletion in fluent_embed/src/decimal.rs at line 39 [19.2537]

Replacement in fluent_embed/src/decimal.rs at line 40 [19.2537]

Replacement in fluent_embed/src/decimal.rs at line 42 [19.2537]

Replacement in fluent_embed/src/decimal.rs at line 54 [19.2537]

Deletion in fluent_embed/src/decimal.rs at line 56 [19.2537]

Replacement in fluent_embed/src/decimal.rs at line 57 [19.2537]

Replacement in fluent_embed/src/decimal.rs at line 63 [19.2537]