mirrors/cargo-expand
1
0
Fork 0
mirror of https://github.com/dtolnay/cargo-expand.git synced 2025-04-05 05:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Match flag_value's signature to Command::arg

Browse source
This commit is contained in:
David Tolnay 2024-04-06 12:24:43 -07:00
parent cfaac2f15c
commit eda549f0e5
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cmd.rs
View file

@ -2,14 +2,14 @@ use std::ffi::OsStr;
use std::process::Command; use std::process::Command;
pub trait CommandExt { pub trait CommandExt {
fn flag_value<K, V>(&mut self, k: K, v: V) fn flag_value<K, V>(&mut self, k: K, v: V) -> &mut Self
where where
K: AsRef<OsStr>, K: AsRef<OsStr>,
V: AsRef<OsStr>; V: AsRef<OsStr>;
} }
impl CommandExt for Command { impl CommandExt for Command {
fn flag_value<K, V>(&mut self, k: K, v: V) fn flag_value<K, V>(&mut self, k: K, v: V) -> &mut Self
where where
K: AsRef<OsStr>, K: AsRef<OsStr>,
V: AsRef<OsStr>, V: AsRef<OsStr>,
@ -19,10 +19,11 @@ impl CommandExt for Command {
if let Some(k) = k.to_str() { if let Some(k) = k.to_str() {
if let Some(v) = v.to_str() { if let Some(v) = v.to_str() {
self.arg(format!("{}={}", k, v)); self.arg(format!("{}={}", k, v));
return; return self;
} }
} }
self.arg(k); self.arg(k);
self.arg(v); self.arg(v);
self
} }
} }

7
src/main.rs
View file

@ -253,8 +253,7 @@ fn do_cargo_expand() -> Result<i32> {
for edition in &["2021", "2018", "2015"] { for edition in &["2021", "2018", "2015"] {
let output = Command::new(&rustfmt) let output = Command::new(&rustfmt)
.arg("--edition") .flag_value("--edition", edition)
.arg(edition)
.arg(&outfile_path) .arg(&outfile_path)
.stderr(Stdio::null()) .stderr(Stdio::null())
.output(); .output();
@ -337,7 +336,9 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: Coloring, outfile: &Path)
cmd.flag_value("--color", "never"); cmd.flag_value("--color", "never");
} }
} }
color => cmd.flag_value("--color", color.to_possible_value().unwrap().get_name()), color => {
cmd.flag_value("--color", color.to_possible_value().unwrap().get_name());
}
} }
for kv in &args.config { for kv in &args.config {