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

Merge pull request #220 from dtolnay/commandargs

Browse source 
Skip a CommandArgs clone
This commit is contained in:
David Tolnay 2024-04-06 09:34:05 -07:00 • committed by GitHub
commit 6b5ab10276
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/cmd.rs
View file

@ -1,6 +1,7 @@
use std::ffi::{OsStr, OsString};
use std::slice;
use std::vec;
#[derive(Clone)]
pub struct CommandArgs {
args: Vec<OsString>,
}
@ -22,17 +23,22 @@ impl CommandArgs {
self.args
.extend(args.into_iter().map(|arg| arg.as_ref().to_owned()));
}
pub fn insert<S: AsRef<OsStr>>(&mut self, index: usize, arg: S) {
self.args.insert(index, arg.as_ref().to_owned());
}
}
impl IntoIterator for CommandArgs {
type Item = OsString;
type IntoIter = <Vec<OsString> as IntoIterator>::IntoIter;
type IntoIter = vec::IntoIter<OsString>;
fn into_iter(self) -> Self::IntoIter {
self.args.into_iter()
}
}
impl<'a> IntoIterator for &'a CommandArgs {
type Item = &'a OsString;
type IntoIter = slice::Iter<'a, OsString>;
fn into_iter(self) -> Self::IntoIter {
self.args.iter()
}
}

8
src/main.rs
View file

@ -460,9 +460,7 @@ fn apply_args(cmd: &mut Command, args: &Expand, color: &Coloring, outfile: &Path
line.arg(ARG_Z_UNPRETTY_EXPANDED);
if args.verbose {
let mut display = line.clone();
display.insert(0, "+nightly");
print_command(display, color)?;
print_command(&line, color)?;
}
cmd.args(line);
@ -515,7 +513,7 @@ fn needs_rustc_bootstrap() -> bool {
!status.success()
}
fn print_command(args: CommandArgs, color: &Coloring) -> Result<()> {
fn print_command(args: &CommandArgs, color: &Coloring) -> Result<()> {
let mut shell_words = String::new();
let quoter = shlex::Quoter::new().allow_nul(true);
for arg in args {
@ -543,7 +541,7 @@ fn print_command(args: CommandArgs, color: &Coloring) -> Result<()> {
let _ = stream.set_color(ColorSpec::new().set_bold(true).set_fg(Some(Green)));
let _ = write!(stream, "{:>12}", "Running");
let _ = stream.reset();
let _ = writeln!(stream, " `cargo{}`", shell_words);
let _ = writeln!(stream, " `cargo +nightly{}`", shell_words);
Ok(())
}