extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-24 17:34:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch to unicase's to_folded_case (#14255)

Browse Source 
# Description
Switch `to_folded_case` to a proper case fold instead of
`str::to_lowercase` now that unicase exposes its `to_folded_case`
method.

Rel: #10884, https://github.com/seanmonstar/unicase/issues/61

# User-Facing Changes

Case insensitive sorts now do proper case folding.

Old behavior:

```nushell
[dreißig DREISSIG] | sort -i
# => ╭───┬──────────╮
# => │ 0 │ DREISSIG │
# => │ 1 │ dreißig  │
# => ╰───┴──────────╯
```

New behavior:

```nushell
[dreißig DREISSIG] | sort -i
# => ╭───┬──────────╮
# => │ 0 │ dreißig  │
# => │ 1 │ DREISSIG │
# => ╰───┴──────────╯
```
This commit is contained in:
132ikl 2024-11-05 03:39:08 -05:00 committed by GitHub
parent 62198a29c2
commit 7a7df3e635
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/nu-utils/src/casing.rs
View File

@ -9,11 +9,6 @@ pub trait IgnoreCaseExt {
/// language-invariant and consistent. Case folded text should be used /// language-invariant and consistent. Case folded text should be used
/// solely for processing and generally should not be stored or displayed. /// solely for processing and generally should not be stored or displayed.
/// ///
/// Note: this method might only do [`str::to_lowercase`] instead of a
/// full case fold, depending on how Nu is compiled. You should still
/// prefer using this method for generating case-insensitive strings,
/// though, as it expresses intent much better than `to_lowercase`.
///
/// [case folded]: <https://unicode.org/faq/casemap_charprop.html#2> /// [case folded]: <https://unicode.org/faq/casemap_charprop.html#2>
fn to_folded_case(&self) -> String; fn to_folded_case(&self) -> String;
@ -40,9 +35,7 @@ pub trait IgnoreCaseExt {
impl IgnoreCaseExt for str { impl IgnoreCaseExt for str {
fn to_folded_case(&self) -> String { fn to_folded_case(&self) -> String {
// we only do to_lowercase, as unicase doesn't expose its case fold yet UniCase::new(self).to_folded_case()
// (seanmonstar/unicase#61) and we don't want to pull in another table
self.to_lowercase()
} }
fn eq_ignore_case(&self, other: &str) -> bool { fn eq_ignore_case(&self, other: &str) -> bool {