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

Fix argument order when called with double hyphen

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

2
Cargo.lock generated
View file

@ -1,6 +1,6 @@
[root]
name = "cargo-expand"
version = "0.3.4"
version = "0.3.5"
dependencies = [
"isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]

24
src/main.rs
View file

@ -136,26 +136,27 @@ fn wrap_args<T, I>(it: I) -> Vec<String>
I: IntoIterator<Item=T>
{
let mut args = vec!["rustc".to_string()];
let mut has_color = false;
let mut has_double_hyphen = false;
let mut ends_with_test = false;
let mut ends_with_example = false;
let mut has_color = false;
for arg in it.into_iter().skip(2) {
let arg = arg.as_ref().to_string();
has_color |= arg.starts_with("--color");
has_double_hyphen |= arg == "--";
let mut it = it.into_iter().skip(2).map(|arg| arg.as_ref().to_string());
for arg in &mut it {
if arg == "--" {
break;
}
ends_with_test = arg == "--test";
ends_with_example = arg == "--example";
has_color |= arg.starts_with("--color");
args.push(arg);
}
if !has_double_hyphen && ends_with_test {
if ends_with_test {
// Expand the `test.rs` test by default.
args.push("test".to_string());
}
if !has_double_hyphen && ends_with_example {
if ends_with_example {
// Expand the `example.rs` example by default.
args.push("example".to_string());
}
@ -166,13 +167,10 @@ fn wrap_args<T, I>(it: I) -> Vec<String>
args.push(format!("--color={}", setting));
}
if !has_double_hyphen {
args.push("--".to_string());
}
args.push("--".to_string());
args.push("-Zunstable-options".to_string());
args.push("--pretty=expanded".to_string());
args.extend(it);
args
}