Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 23:02:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2374 from dylni/upgrade-os-str-bytes

Browse source 
Upgrade os_str_bytes
This commit is contained in:
Pavan Kumar Sunkara 2021-03-02 02:10:42 +00:00 committed by GitHub
commit e242cc1c7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -69,7 +69,7 @@ clap_derive = { path = "./clap_derive", version = "3.0.0-beta.2", optional = tru
bitflags = "1.2" bitflags = "1.2"
textwrap = { version = "0.13.3", default-features = false, features = [] } textwrap = { version = "0.13.3", default-features = false, features = [] }
indexmap = "1.0" indexmap = "1.0"
os_str_bytes = { version = "2.4", features = ["raw"] } os_str_bytes = { version = "3.0", features = ["raw"] }
vec_map = "0.8" vec_map = "0.8"
strsim = { version = "0.10", optional = true } strsim = { version = "0.10", optional = true }
yaml-rust = { version = "0.4.1", optional = true } yaml-rust = { version = "0.4.1", optional = true }

16
src/parse/parser.rs
View file

@ -429,7 +429,7 @@ impl<'help, 'app> Parser<'help, 'app> {
// get the option so we can check the settings // get the option so we can check the settings
needs_val_of = self.add_val_to_arg( needs_val_of = self.add_val_to_arg(
&self.app[&id], &self.app[&id],
&arg_os, arg_os,
matcher, matcher,
ValueType::CommandLine, ValueType::CommandLine,
true, true,
@ -523,7 +523,7 @@ impl<'help, 'app> Parser<'help, 'app> {
// doesn't have any value. This behaviour is right because // doesn't have any value. This behaviour is right because
// positional arguments are always present continiously. // positional arguments are always present continiously.
let append = self.arg_have_val(matcher, p); let append = self.arg_have_val(matcher, p);
self.add_val_to_arg(p, &arg_os, matcher, ValueType::CommandLine, append); self.add_val_to_arg(p, arg_os, matcher, ValueType::CommandLine, append);
// Increase occurence no matter if we are appending, Occurences // Increase occurence no matter if we are appending, Occurences
// of positional argument equals to number of values rather than // of positional argument equals to number of values rather than
@ -1174,7 +1174,7 @@ impl<'help, 'app> Parser<'help, 'app> {
fv, fv,
fv.starts_with("=") fv.starts_with("=")
); );
self.add_val_to_arg(opt, &v, matcher, ValueType::CommandLine, false); self.add_val_to_arg(opt, v, matcher, ValueType::CommandLine, false);
} else if require_equals && !empty_vals && !min_vals_zero { } else if require_equals && !empty_vals && !min_vals_zero {
debug!("None, but requires equals...Error"); debug!("None, but requires equals...Error");
return Err(ClapError::empty_value( return Err(ClapError::empty_value(
@ -1223,7 +1223,7 @@ impl<'help, 'app> Parser<'help, 'app> {
fn add_val_to_arg( fn add_val_to_arg(
&self, &self,
arg: &Arg<'help>, arg: &Arg<'help>,
val: &ArgStr, val: ArgStr,
matcher: &mut ArgMatcher, matcher: &mut ArgMatcher,
ty: ValueType, ty: ValueType,
append: bool, append: bool,
@ -1249,7 +1249,7 @@ impl<'help, 'app> Parser<'help, 'app> {
} else { } else {
arg_split.collect() arg_split.collect()
}; };
let vals = vals.into_iter().map(|x| x.to_os_string()).collect(); let vals = vals.into_iter().map(|x| x.into_os_string()).collect();
self.add_multiple_vals_to_arg(arg, vals, matcher, ty, append); self.add_multiple_vals_to_arg(arg, vals, matcher, ty, append);
// If there was a delimiter used or we must use the delimiter to // If there was a delimiter used or we must use the delimiter to
// separate the values or no more vals is needed, we're not // separate the values or no more vals is needed, we're not
@ -1426,7 +1426,7 @@ impl<'help, 'app> Parser<'help, 'app> {
}; };
if add { if add {
self.add_val_to_arg(arg, &ArgStr::new(default), matcher, ty, false); self.add_val_to_arg(arg, ArgStr::new(default), matcher, ty, false);
return; return;
} }
} }
@ -1497,11 +1497,11 @@ impl<'help, 'app> Parser<'help, 'app> {
// Use env only if the arg was not present among command line args // Use env only if the arg was not present among command line args
if matcher.get(&a.id).map_or(true, |a| a.occurs == 0) { if matcher.get(&a.id).map_or(true, |a| a.occurs == 0) {
if let Some((_, Some(ref val))) = a.env { if let Some((_, Some(ref val))) = a.env {
let val = &ArgStr::new(val); let val = ArgStr::new(val);
if a.is_set(ArgSettings::TakesValue) { if a.is_set(ArgSettings::TakesValue) {
self.add_val_to_arg(a, val, matcher, ValueType::EnvVariable, false); self.add_val_to_arg(a, val, matcher, ValueType::EnvVariable, false);
} else { } else {
self.check_for_help_and_version_str(val)?; self.check_for_help_and_version_str(&val)?;
matcher.add_index_to(&a.id, self.cur_idx.get(), ValueType::EnvVariable); matcher.add_index_to(&a.id, self.cur_idx.get(), ValueType::EnvVariable);
} }
} }

10
src/util/argstr.rs
View file

@ -5,13 +5,13 @@ use std::{
str, str,
}; };
use os_str_bytes::{raw, OsStrBytes, OsStringBytes}; use os_str_bytes::{raw, OsStrBytes};
pub(crate) struct ArgStr<'a>(Cow<'a, [u8]>); pub(crate) struct ArgStr<'a>(Cow<'a, [u8]>);
impl<'a> ArgStr<'a> { impl<'a> ArgStr<'a> {
pub(crate) fn new(s: &'a OsStr) -> Self { pub(crate) fn new(s: &'a OsStr) -> Self {
Self(s.to_bytes()) Self(s.to_raw_bytes())
} }
pub(crate) fn starts_with(&self, s: &str) -> bool { pub(crate) fn starts_with(&self, s: &str) -> bool {
@ -120,7 +120,11 @@ impl<'a> ArgStr<'a> {
} }
pub(crate) fn to_os_string(&self) -> OsString { pub(crate) fn to_os_string(&self) -> OsString {
OsString::from_bytes(&self.0).unwrap() self.to_borrowed().into_os_string()
}
pub(crate) fn into_os_string(self) -> OsString {
OsStr::from_raw_bytes(self.0).unwrap().into_owned()
} }
} }