Finchie/l10n_embed - Change 7YOM2QEFZ5HWVEISP3VIR2GKF2NNH4KKTLTWEMYMMWNYKICXWTZAC

Move interaction constructors from individual types to implementations on `InteractionEnvironment`

For example, Input::new() is now InteractionEnvironment::new_input(). This allows all interactions to re-use the new locale field stored in the environment, and brings the API in line with how ProgressBar already stored the environment internally.

Created by finchie on August 7, 2025

7YOM2QEFZ5HWVEISP3VIR2GKF2NNH4KKTLTWEMYMMWNYKICXWTZAC

Dependencies

In channels

main

Change contents

Insertion in Cargo.lock at line 843 [5.4277]
[4.3564]
[4.3564]
```
 "icu_locale",
```

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 1 [6.109]

B:BD[6.109] → [6.110:178]

use super::macros::{impl_new, impl_with_default, impl_with_prompt};

[6.109]

[7.0]

use super::macros::{impl_with_default, impl_with_prompt};

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 5 [6.109]

B:BD[6.308] → [6.308:347]

#[derive(Default)]
pub struct Select {

[6.308]

[6.347]

pub struct Select<'environment> {
    environment: &'environment InteractionEnvironment,

Deletion in l10n_embed_interaction/src/prompt/select.rs at line 12 [6.109]
B:BD[6.438] → [6.438:457]
```
impl_new!(Select);
```

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 15 [6.109]

B:BD[6.520] → [6.520:534]

impl Select {

[6.520]

[8.29]

impl<'environment> Select<'environment> {
    pub(crate) fn new_from_environment(environment: &'environment InteractionEnvironment) -> Self {
        Self {
            environment,
            default: None,
            items: None,
            prompt: None,
        }
    }

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 28 [6.109]

B:BD[6.685] → [9.0:37]

            .map(Localize::localize)

[6.685]

[8.98]

            .map(|item| item.message_for_locale(&self.environment.locale))

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 35 [6.109]

B:BD[6.1149] → [7.56:188]

∅:D[7.188] → [6.1250:1286]

B:BD[6.1250] → [6.1250:1286]

    pub fn interact(
        self,
        environment: &InteractionEnvironment,
    ) -> Result<Option<usize>, InteractionError> {
        match environment.context {

[6.1149]

[6.1286]

    pub fn interact(self) -> Result<Option<usize>, InteractionError> {
        match self.environment.context {

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 1 [6.2012]

B:BD[6.2012] → [6.2013:2083]

use super::macros::{impl_new, impl_with_prompt, impl_with_validator};

[6.2012]

[7.303]

use super::macros::{impl_with_prompt, impl_with_validator};

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 10 [6.2012]

B:BD[6.2294] → [6.2294:2335]

#[derive(Default)]
pub struct Password {

[6.2294]

[6.2335]

pub struct Password<'environment> {
    environment: &'environment InteractionEnvironment,

Deletion in l10n_embed_interaction/src/prompt/password.rs at line 17 [6.2012]
B:BD[6.2481] → [6.2481:2502]
```
impl_new!(Password);
```

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 20 [6.2012]

B:BD[6.2564] → [6.2564:2580]

impl Password {

[6.2564]

[6.2580]

impl<'environment> Password<'environment> {
    pub(crate) fn new_from_environment(environment: &'environment InteractionEnvironment) -> Self {
        Self {
            environment,
            confirmation: None,
            prompt: None,
            validator: None,
        }
    }

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 35 [6.2012]

B:BD[8.197] → [8.197:315]

        let confirmation_text = confirmation.localize();
        let mismatch_error_text = mismatch_error.localize();

[8.197]

[6.2895]

        let confirmation_text = confirmation.message_for_locale(&self.environment.locale);
        let mismatch_error_text = mismatch_error.message_for_locale(&self.environment.locale);

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 46 [6.2012]

B:BD[6.3224] → [6.3224:3305]

B:BD[6.3305] → [7.359:411]

∅:D[7.411] → [6.3349:3385]

B:BD[6.3349] → [6.3349:3385]

    pub fn interact(
        self,
        environment: &InteractionEnvironment,
    ) -> Result<Option<String>, InteractionError> {
        match environment.context {

[6.3224]

[6.3385]

    pub fn interact(self) -> Result<Option<String>, InteractionError> {
        match self.environment.context {

Deletion in l10n_embed_interaction/src/prompt/macros.rs at line 1 [6.4406]

B:BD[6.4406] → [6.4407:4481]

B:BD[6.4481] → [10.0:47]

∅:D[10.47] → [6.4516:4582]

B:BD[6.4516] → [6.4516:4582]

macro_rules! impl_new {
    ($newtype:ident) => {
        impl $newtype {
            #[must_use] pub fn new() -> Self {
                Self::default()
            }
        }
    };
}

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 3 [6.4406]

B:BD[6.4657] → [6.4657:4681]

B:BD[6.4681] → [10.48:140]

        impl $newtype {
            #[must_use] pub const fn with_default(mut self, default: $field_type) -> Self {

[6.4657]

[6.4755]

        impl<'environment> $newtype<'environment> {
            #[must_use]
            pub const fn with_default(mut self, default: $field_type) -> Self {

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 15 [6.4406]
B:BD[6.4914] → [6.4914:4938]
```
        impl $newtype {
```
[6.4914]
[4.88]
```
        impl<'environment> $newtype<'environment> {
```

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 17 [6.4406]

∅:D[4.175] → [8.419:475]

B:BD[8.419] → [8.419:475]

                let localized_text = prompt.localize();

[4.175]

[6.5244]

                let localized_text = prompt.message_for_locale(&self.environment.locale);

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 28 [6.4406]
B:BD[6.5417] → [6.5417:5441]
```
        impl $newtype {
```
[6.5417]
[8.498]
```
        impl<'environment> $newtype<'environment> {
```
Insertion in l10n_embed_interaction/src/prompt/macros.rs at line 36 [6.4406]
[6.5612]
[6.5612]
```
                let locale = self.environment.locale.clone();
```

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 42 [6.4406]

B:BD[6.5892] → [8.651:703]

                            Err(message.localize())

[6.5892]

[6.6188]

                            Err(message.message_for_locale(&locale))

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 54 [6.4406]

B:BD[6.6369] → [6.6369:6454]

pub(crate) use {impl_new, impl_with_default, impl_with_prompt, impl_with_validator};

[6.6369]

pub(crate) use {impl_with_default, impl_with_prompt, impl_with_validator};

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 1 [6.6488]

B:BD[6.6488] → [6.6489:6559]

use super::macros::{impl_new, impl_with_prompt, impl_with_validator};

[6.6488]

[7.526]

use super::macros::{impl_with_prompt, impl_with_validator};

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 5 [6.6488]

B:BD[6.6689] → [6.6689:6727]

#[derive(Default)]
pub struct Input {

[6.6689]

[6.6727]

pub struct Input<'environment> {
    environment: &'environment InteractionEnvironment,

Deletion in l10n_embed_interaction/src/prompt/input.rs at line 12 [6.6488]
B:BD[6.6854] → [6.6854:6872]
```
impl_new!(Input);
```

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 15 [6.6488]

B:BD[6.6928] → [6.6928:6941]

impl Input {

[6.6928]

[8.733]

impl<'environment> Input<'environment> {
    pub(crate) fn new_from_environment(environment: &'environment InteractionEnvironment) -> Self {
        Self {
            environment,
            default: None,
            prompt: None,
            validator: None,
        }
    }

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 26 [6.6488]

B:BD[8.802] → [8.802:851]

        let localized_text = default.localize();

[8.802]

[6.7171]

        let localized_text = default.message_for_locale(&self.environment.locale);

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 32 [6.6488]

B:BD[6.7241] → [6.7241:7322]

B:BD[6.7322] → [7.582:634]

∅:D[7.634] → [6.7366:7402]

B:BD[6.7366] → [6.7366:7402]

    pub fn interact(
        self,
        environment: &InteractionEnvironment,
    ) -> Result<Option<String>, InteractionError> {
        match environment.context {

[6.7241]

[6.7402]

    pub fn interact(self) -> Result<Option<String>, InteractionError> {
        match self.environment.context {

Replacement in l10n_embed_interaction/src/prompt/confirm.rs at line 1 [6.8140]

B:BD[6.8140] → [6.8141:8209]

use super::macros::{impl_new, impl_with_default, impl_with_prompt};

[6.8140]

[7.749]

use super::macros::{impl_with_default, impl_with_prompt};

Replacement in l10n_embed_interaction/src/prompt/confirm.rs at line 4 [6.8140]

B:BD[6.8339] → [6.8339:8379]

#[derive(Default)]
pub struct Confirm {

[6.8339]

[6.8379]

pub struct Confirm<'environment> {
    environment: &'environment InteractionEnvironment,

Deletion in l10n_embed_interaction/src/prompt/confirm.rs at line 10 [6.8140]
B:BD[6.8437] → [6.8437:8457]
```
impl_new!(Confirm);
```

Replacement in l10n_embed_interaction/src/prompt/confirm.rs at line 13 [6.8140]

B:BD[6.8521] → [6.8521:8536]

B:BD[6.8536] → [7.805:936]

∅:D[7.936] → [6.8636:8672]

B:BD[6.8636] → [6.8636:8672]

impl Confirm {
    pub fn interact(
        self,
        environment: &InteractionEnvironment,
    ) -> Result<Option<bool>, InteractionError> {
        match environment.context {

[6.8521]

[6.8672]

impl<'environment> Confirm<'environment> {
    pub(crate) fn new_from_environment(environment: &'environment InteractionEnvironment) -> Self {
        Self {
            environment,
            default: None,
            prompt: None,
        }
    }
    pub fn interact(self) -> Result<Option<bool>, InteractionError> {
        match self.environment.context {

Deletion in l10n_embed_interaction/src/progress.rs at line 2 [11.513]
B:BD[11.549] → [4.245:271]
```
use l10n_embed::Localize;
```
Insertion in l10n_embed_interaction/src/progress.rs at line 3 [11.513]
[11.628]
[11.628]
```
use l10n_embed::Localize;
```

Replacement in l10n_embed_interaction/src/progress.rs at line 17 [11.513]

B:BD[11.938] → [11.938:1033]

B:BD[11.1033] → [2.26:140]

impl ProgressBar {
    pub fn new(environment: &InteractionEnvironment, length: u64) -> Self {
        let progress_bar =
            indicatif::ProgressBar::new(length).with_style(PROGRESS_TEMPLATE.clone());

[11.938]

[2.140]

impl<'environment> ProgressBar {
    pub(crate) fn new_from_environment<L: Localize>(
        environment: &'environment InteractionEnvironment,
        message: L,
        length: u64,
    ) -> Self {
        let localized_text = message.message_for_locale(&environment.locale);
        let progress_bar = indicatif::ProgressBar::new(length)
            .with_style(PROGRESS_TEMPLATE.clone())
            .with_message(localized_text);

Deletion in l10n_embed_interaction/src/progress.rs at line 33 [11.513]
B:BD[11.1224] → [11.1224:1231]
B:BD[11.1231] → [8.895:964]
B:BD[8.964] → [8.964:1013]
∅:D[9.380] → [11.1461:1538]
∅:D[8.1013] → [11.1461:1538]
B:BD[11.1461] → [11.1461:1538]
B:BD[11.1538] → [8.1014:1027]
```
    }
    pub fn with_message<L: Localize>(mut self, message: L) -> Self {
        let localized_text = message.localize();
        self.progress_bar = self.progress_bar.with_message(localized_text);
        self
```
Insertion in l10n_embed_interaction/src/lib.rs at line 5 [6.9269]
[6.9295]
[4.272]
```
use icu_locale::Locale;
use indicatif::MultiProgress;
```
Deletion in l10n_embed_interaction/src/lib.rs at line 8 [6.9269]
∅:D[12.28] → [11.1735:1765]
∅:D[4.298] → [11.1735:1765]
B:BD[6.9295] → [11.1735:1765]
```
use indicatif::MultiProgress;
```
Insertion in l10n_embed_interaction/src/lib.rs at line 35 [6.9269]
[6.10055]
[11.1850]
```
    locale: Locale,
```

Replacement in l10n_embed_interaction/src/lib.rs at line 41 [6.9269]

B:BD[12.45] → [12.45:89]

    pub fn new(interactive: bool) -> Self {

[12.45]

[6.10132]

    pub fn new(locale: Locale, interactive: bool) -> Self {

Insertion in l10n_embed_interaction/src/lib.rs at line 47 [6.9269]
[12.261]
[11.1885]
```
            locale,
```

Replacement in l10n_embed_interaction/src/lib.rs at line 53 [6.9269]

∅:D[3.88] → [13.96:151]

B:BD[13.96] → [13.96:151]

        self.progress_bars.println(message.localize())

[3.88]

[6.10328]

        self.progress_bars
            .println(message.message_for_locale(&self.locale))
    }
}
macro_rules! impl_constructor {
    ($prompt_name:ident, $prompt_type:ident) => {
        impl InteractionEnvironment {
            #[must_use]
            pub fn $prompt_name<'environment>(&'environment self) -> $prompt_type<'environment> {
                $prompt_type::new_from_environment(self)
            }
        }
    };
}
// Create constructors on InteractionEnvironment for different interaction types
impl_constructor!(new_confirm, Confirm);
impl_constructor!(new_editor, Editor);
impl_constructor!(new_input, Input);
impl_constructor!(new_password, Password);
impl_constructor!(new_select, Select);
// Special implementation for progress bars as the signature is different
impl InteractionEnvironment {
    pub fn new_progress<'environment, L: Localize>(
        &'environment self,
        message: L,
        length: u64,
    ) -> ProgressBar {
        ProgressBar::new_from_environment(self, message, length)

Replacement in l10n_embed_interaction/src/editor.rs at line 3 [6.10371]
B:BD[6.10480] → [6.10480:10500]
```
pub struct Editor {
```
[6.10480]
[6.10500]
```
pub struct Editor<'environment> {
    environment: &'environment InteractionEnvironment,
```

Replacement in l10n_embed_interaction/src/editor.rs at line 8 [6.10371]

B:BD[10.377] → [10.377:450]

impl Default for Editor {
    fn default() -> Self {
        Self::new()

[10.377]

[10.450]

impl<'environment> Editor<'environment> {
    pub(crate) fn new_from_environment(environment: &'environment InteractionEnvironment) -> Self {
        Self {
            environment,
            extension: None,
        }

Deletion in l10n_embed_interaction/src/editor.rs at line 15 [6.10371]
∅:D[10.456] → [6.10531:10533]
B:BD[6.10531] → [6.10531:10533]
```
}
```
Deletion in l10n_embed_interaction/src/editor.rs at line 16 [6.10371]
B:BD[6.10534] → [6.10534:10548]
```
impl Editor {
```
Deletion in l10n_embed_interaction/src/editor.rs at line 17 [6.10371]
B:BD[7.1143] → [7.1143:1176]
∅:D[10.502] → [6.10575:10615]
∅:D[7.1176] → [6.10575:10615]
B:BD[6.10575] → [6.10575:10615]
B:BD[6.10615] → [7.1177:1193]
```
    pub const fn new() -> Self {
        Self { extension: None }
    }
    #[must_use]
```

Replacement in l10n_embed_interaction/src/editor.rs at line 22 [6.10371]

B:BD[6.10752] → [6.10752:10938]

    pub fn edit(
        &self,
        environment: &InteractionEnvironment,
        text: &str,
    ) -> Result<Option<String>, InteractionError> {
        match environment.context {

[6.10752]

[6.10938]

    pub fn edit(self, text: &str) -> Result<Option<String>, InteractionError> {
        match self.environment.context {

Insertion in l10n_embed_interaction/Cargo.toml at line 20 [6.11365]
[6.11514]
[11.1935]
```
icu_locale.workspace = true
```

Move interaction constructors from individual types to implementations on `InteractionEnvironment`

Dependencies

In channels

Change contents

Insertion in Cargo.lock at line 843 [5.4277]

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 1 [6.109]

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 5 [6.109]

Deletion in l10n_embed_interaction/src/prompt/select.rs at line 12 [6.109]

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 15 [6.109]

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 28 [6.109]

Replacement in l10n_embed_interaction/src/prompt/select.rs at line 35 [6.109]

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 1 [6.2012]

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 10 [6.2012]

Deletion in l10n_embed_interaction/src/prompt/password.rs at line 17 [6.2012]

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 20 [6.2012]

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 35 [6.2012]

Replacement in l10n_embed_interaction/src/prompt/password.rs at line 46 [6.2012]

Deletion in l10n_embed_interaction/src/prompt/macros.rs at line 1 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 3 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 15 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 17 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 28 [6.4406]

Insertion in l10n_embed_interaction/src/prompt/macros.rs at line 36 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 42 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/macros.rs at line 54 [6.4406]

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 1 [6.6488]

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 5 [6.6488]

Deletion in l10n_embed_interaction/src/prompt/input.rs at line 12 [6.6488]

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 15 [6.6488]

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 26 [6.6488]

Replacement in l10n_embed_interaction/src/prompt/input.rs at line 32 [6.6488]

Replacement in l10n_embed_interaction/src/prompt/confirm.rs at line 1 [6.8140]

Replacement in l10n_embed_interaction/src/prompt/confirm.rs at line 4 [6.8140]

Deletion in l10n_embed_interaction/src/prompt/confirm.rs at line 10 [6.8140]

Replacement in l10n_embed_interaction/src/prompt/confirm.rs at line 13 [6.8140]

Deletion in l10n_embed_interaction/src/progress.rs at line 2 [11.513]

Insertion in l10n_embed_interaction/src/progress.rs at line 3 [11.513]

Replacement in l10n_embed_interaction/src/progress.rs at line 17 [11.513]

Deletion in l10n_embed_interaction/src/progress.rs at line 33 [11.513]

Insertion in l10n_embed_interaction/src/lib.rs at line 5 [6.9269]

Deletion in l10n_embed_interaction/src/lib.rs at line 8 [6.9269]

Insertion in l10n_embed_interaction/src/lib.rs at line 35 [6.9269]

Replacement in l10n_embed_interaction/src/lib.rs at line 41 [6.9269]

Insertion in l10n_embed_interaction/src/lib.rs at line 47 [6.9269]

Replacement in l10n_embed_interaction/src/lib.rs at line 53 [6.9269]

Replacement in l10n_embed_interaction/src/editor.rs at line 3 [6.10371]

Replacement in l10n_embed_interaction/src/editor.rs at line 8 [6.10371]

Deletion in l10n_embed_interaction/src/editor.rs at line 15 [6.10371]

Deletion in l10n_embed_interaction/src/editor.rs at line 16 [6.10371]

Deletion in l10n_embed_interaction/src/editor.rs at line 17 [6.10371]

Replacement in l10n_embed_interaction/src/editor.rs at line 22 [6.10371]

Insertion in l10n_embed_interaction/Cargo.toml at line 20 [6.11365]