finchie/cli_framework - Change WBI5HFOBBUMDSGKY2RX3YA6N7YDCJEP23JNEJ7PG5VZXHLYIRJRQC

Add simple wrapper for `libc::settext()` to query system locale

Most likely a more robust version of the custom implementation, might be put behind a feature so users can select the right implementation for their use-case.

Created by finchie on June 27, 2024

WBI5HFOBBUMDSGKY2RX3YA6N7YDCJEP23JNEJ7PG5VZXHLYIRJRQC

Dependencies

In channels

main

Change contents

Insertion in Cargo.lock at line 21 [4.4277]
[3.1208]
[3.1208]
```
 "locale_select",
```

Insertion in Cargo.lock at line 206 [4.4277]

[3.3670]


[[package]]
name = "libc"
version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"

Insertion in Cargo.lock at line 225 [4.4277]
[5.5729]
[5.5729]
```
 "libc",
```
Insertion in locale_select/Cargo.toml at line 5 [5.5449]
[5.5518]
[5.5518]
```
[lints]
workspace = true
```
Replacement in locale_select/Cargo.toml at line 12 [5.5449]
B:BD[5.5554] → [5.5554:5555]
B:BD[5.5555] → [5.5555:5580]
```
[lints]
workspace = true
```
[5.5554]
```
libc = "0.2.153"
```
Replacement in locale_select/src/unix.rs at line 3 [5.488]
B:BD[6.234] → [2.0:52]
```
use icu_locid::subtags::{self, Language, Variants};
```
[6.234]
[6.276]
```
use icu_locid::subtags::{self, Variants};
```
Replacement in locale_select/src/unix.rs at line 206 [5.488]
B:BD[2.185] → [2.185:208]
```
        .get_locales()
```
[2.185]
[2.208]
```
        .get_locales_custom()
```
Replacement in locale_select/src/lib.rs at line 4 [5.5398]
∅:D[2.604] → [7.0:11]
B:BD[5.5398] → [7.0:11]
```
mod fetch;
```
[2.604]
[5.5399]
```
pub mod fetch;
```
Insertion in locale_select/src/lib.rs at line 7 [5.5398]
[2.606]
[2.606]
```
// TODO: this can probably be enums, not strings
```
Replacement in locale_select/src/lib.rs at line 11 [5.5398]
B:BD[2.700] → [2.700:731]
```
) -> Vec<LanguageIdentifier> {
```
[2.700]
[2.731]
```
) -> LanguageIdentifier {
```

Replacement in locale_select/src/lib.rs at line 13 [5.5398]

B:BD[2.799] → [2.799:877]

    let requested = unix::get_locales(fetch::unix::LocaleCategory::Messages);

[2.799]

[2.877]

    let requested = unix::get_locales(fetch::unix::LocaleCategory::LC_MESSAGES);

Replacement in locale_select/src/lib.rs at line 21 [5.5398]

B:BD[2.1045] → [2.1045:1162]

    // TODO: this is wasteful but avoids dealing with lifetimes for now
    supported.into_iter().cloned().collect()

[2.1045]

[2.1162]

    // TODO: properly handle this case
    if let [single_locale] = supported[..] {
        // TODO: this is wasteful but avoids dealing with lifetimes for now
        single_locale.to_owned()
    } else {
        todo!("Multiple locales returned, which is not yet handled. Got: {supported:#?}");
    }

Insertion in locale_select/src/fetch/unix.rs at line 2 [7.63]

[7.78]

use std::ffi::CStr;
const NUL_BYTE: &[u8] = b"\0";
macro_rules! repr_lc {
    ($($variant:ident),+) => {
        #[derive(Clone, Copy, Debug)]
        #[allow(non_camel_case_types)] // Required for parity with C enum
        pub enum LocaleCategory {
            $($variant,)*
        }
        impl TryFrom<i32> for LocaleCategory {
            type Error = ();

Replacement in locale_select/src/fetch/unix.rs at line 17 [7.63]

B:BD[7.79] → [2.1165:1191]

∅:D[2.1191] → [7.106:269]

B:BD[7.106] → [7.106:269]

pub enum LocaleCategory {
    CType,
    Collate,
    Messages,
    Monetary,
    Numeric,
    Time,
    Address,
    Identification,
    Measurement,
    Name,
    Paper,
    Telephone,
}

[7.79]

[7.269]

            fn try_from(value: i32) -> Result<Self, Self::Error> {
                match value {
                    $(libc::$variant => Ok(Self::$variant),)*
                    _ => Err(())
                }
            }
        }
        impl Into<i32> for LocaleCategory {
            fn into(self) -> i32 {
                match self {
                    $(Self::$variant => libc::$variant,)*
                }
            }
        }

Replacement in locale_select/src/fetch/unix.rs at line 34 [7.63]

B:BD[7.270] → [2.1192:1214]

∅:D[2.1214] → [7.297:875]

B:BD[7.297] → [7.297:875]

impl LocaleCategory {
    fn as_str(&self) -> &str {
        match self {
            Self::CType => "LC_CTYPE",
            Self::Collate => "LC_COLLATE",
            Self::Messages => "LC_MESSAGES",
            Self::Monetary => "LC_MONETARY",
            Self::Numeric => "LC_NUMERIC",
            Self::Time => "LC_TIME",
            Self::Address => "LC_ADDRESS",
            Self::Identification => "LC_IDENTIFICATION",
            Self::Measurement => "LC_MEASUREMENT",
            Self::Name => "LC_NAME",
            Self::Paper => "LC_PAPER",
            Self::Telephone => "LC_TELEPHONE",

[7.270]

[7.875]

        impl LocaleCategory {
            fn as_str(&self) -> &str {
                match self {
                    $(Self::$variant => stringify!($variant),)*
                }
            }

Insertion in locale_select/src/fetch/unix.rs at line 42 [7.63]

[7.891]

[7.893]

}
repr_lc! {
    LC_ALL,
    LC_CTYPE,
    LC_COLLATE,
    LC_MESSAGES,
    LC_MONETARY,
    LC_NUMERIC,
    LC_TIME,
    LC_ADDRESS,
    LC_IDENTIFICATION,
    LC_MEASUREMENT,
    LC_NAME,
    LC_PAPER,
    LC_TELEPHONE
}

Insertion in locale_select/src/fetch/unix.rs at line 60 [7.63]

[7.894]

[7.921]

// TODO: handle and document safety invariants
fn get_locale_libc(category: i32) -> String {
    let empty_cstr = CStr::from_bytes_with_nul(NUL_BYTE).unwrap();
    let locale_string_pointer = unsafe { libc::setlocale(category, empty_cstr.as_ptr()) };
    let locale_c_str = unsafe { CStr::from_ptr(locale_string_pointer) };
    locale_c_str.to_str().unwrap().to_string()
}
impl LocaleCategory {

Replacement in locale_select/src/fetch/unix.rs at line 78 [7.63]
B:BD[7.1247] → [2.1215:1262]
```
    pub fn get_locales(&self) -> Vec<String> {
```
[7.1247]
[2.1262]
```
    pub fn get_locales_custom(&self) -> Vec<String> {
```

Insertion in locale_select/src/fetch/unix.rs at line 94 [7.63]

[2.1577]

[7.1603]

    }
    pub fn get_locales_libc(self) -> Vec<String> {
        let global_locale = get_locale_libc(libc::LC_ALL);
        let locale_for_category = get_locale_libc(self.into());
        vec![global_locale, locale_for_category]

Add simple wrapper for `libc::settext()` to query system locale

Dependencies

In channels

Change contents

Insertion in Cargo.lock at line 21 [4.4277]

Insertion in Cargo.lock at line 206 [4.4277]

Insertion in Cargo.lock at line 225 [4.4277]

Insertion in locale_select/Cargo.toml at line 5 [5.5449]

Replacement in locale_select/Cargo.toml at line 12 [5.5449]

Replacement in locale_select/src/unix.rs at line 3 [5.488]

Replacement in locale_select/src/unix.rs at line 206 [5.488]

Replacement in locale_select/src/lib.rs at line 4 [5.5398]

Insertion in locale_select/src/lib.rs at line 7 [5.5398]

Replacement in locale_select/src/lib.rs at line 11 [5.5398]