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

Switch to OsString

Browse source
This commit is contained in:
David Tolnay 2017-01-08 10:57:15 -08:00
parent a61fb22b17
commit 683f49bf95
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -11,7 +11,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -26,7 +26,7 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.18"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -42,6 +42,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "a51822fc847e7a8101514d1d44e354ba2ffa7d4c194dcab48870740e327cac70"
"checksum libc 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9e030dc72013ed68994d1b2cbf36a94dd0e58418ba949c4b0db7eeb70a7a6352"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"

36
src/main.rs
View file

@ -1,4 +1,5 @@
use std::env;
use std::ffi::OsString;
use std::io::{self, Write};
use std::process::{self, Command};
@ -23,7 +24,7 @@ fn main() {
fn cargo_expand() -> io::Result<i32> {
// Build cargo command
let mut cmd = Command::new("cargo");
cmd.args(&wrap_args(env::args()));
cmd.args(&wrap_args(env::args_os()));
run(cmd)
}
@ -35,7 +36,7 @@ fn cargo_expand() -> io::Result<i32> {
// Build cargo command
let mut cmd = Command::new("cargo");
cmd.args(&wrap_args(env::args()));
cmd.args(&wrap_args(env::args_os()));
// Pipe to rustfmt
let _wait = match which(&["rustfmt"]) {
@ -131,45 +132,44 @@ impl PipeTo for Command {
}
// Based on https://github.com/rsolomo/cargo-check
fn wrap_args<T, I>(it: I) -> Vec<String>
where T: AsRef<str>,
I: IntoIterator<Item=T>
fn wrap_args<I>(it: I) -> Vec<OsString>
where I: IntoIterator<Item=OsString>
{
let mut args = vec!["rustc".to_string()];
let mut args = vec!["rustc".into()];
let mut ends_with_test = false;
let mut ends_with_example = false;
let mut has_color = false;
let mut it = it.into_iter().skip(2).map(|arg| arg.as_ref().to_string());
let mut it = it.into_iter().skip(2);
for arg in &mut it {
if arg == "--" {
if arg == *"--" {
break;
}
ends_with_test = arg == "--test";
ends_with_example = arg == "--example";
has_color |= arg.starts_with("--color");
args.push(arg);
ends_with_test = arg == *"--test";
ends_with_example = arg == *"--example";
has_color |= arg.to_str().unwrap_or("").starts_with("--color");
args.push(arg.into());
}
if ends_with_test {
// Expand the `test.rs` test by default.
args.push("test".to_string());
args.push("test".into());
}
if ends_with_example {
// Expand the `example.rs` example by default.
args.push("example".to_string());
args.push("example".into());
}
if !has_color {
let color = stdout_isatty() && stderr_isatty();
let setting = if color { "always" } else { "never" };
args.push(format!("--color={}", setting));
args.push(format!("--color={}", setting).into());
}
args.push("--".to_string());
args.push("-Zunstable-options".to_string());
args.push("--pretty=expanded".to_string());
args.push("--".into());
args.push("-Zunstable-options".into());
args.push("--pretty=expanded".into());
args.extend(it);
args
}