Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-03-04 23:37:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2989

Browse source 
2989: fix: Allow unicode aware case insensitivity r=pksunkara a=epage



Co-authored-by: Ed Page <eopage@gmail.com>
This commit is contained in:
bors[bot] 2021-11-04 20:28:49 +00:00 • committed by GitHub
commit 4dfa56a9e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/parse/matches/matched_arg.rs
View file

@ -5,6 +5,7 @@ use std::{
slice::Iter, slice::Iter,
}; };
use crate::util::eq_ignore_case;
use crate::INTERNAL_ERROR_MSG; use crate::INTERNAL_ERROR_MSG;
// TODO: Maybe make this public? // TODO: Maybe make this public?
@ -127,7 +128,8 @@ impl MatchedArg {
pub(crate) fn contains_val(&self, val: &str) -> bool { pub(crate) fn contains_val(&self, val: &str) -> bool {
self.vals_flatten().any(|v| { self.vals_flatten().any(|v| {
if self.case_insensitive { if self.case_insensitive {
v.eq_ignore_ascii_case(val) // If `v` isn't utf8, it can't match `val`, so `OsStr::to_str` should be fine
v.to_str().map_or(false, |v| eq_ignore_case(v, val))
} else { } else {
OsString::as_os_str(v) == OsStr::new(val) OsString::as_os_str(v) == OsStr::new(val)
} }