Don't panic if cargo rustc fails
This commit is contained in:
parent
132d9d3707
commit
6a309af2f3
1 changed files with 2 additions and 4 deletions
|
@ -122,13 +122,11 @@ pub fn main() {
|
||||||
if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) {
|
if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) {
|
||||||
let args = wrap_args(std::env::args().skip(2), dep_path, sys_root);
|
let args = wrap_args(std::env::args().skip(2), dep_path, sys_root);
|
||||||
let path = std::env::current_exe().expect("current executable path invalid");
|
let path = std::env::current_exe().expect("current executable path invalid");
|
||||||
let run = std::process::Command::new("cargo")
|
std::process::Command::new("cargo")
|
||||||
.args(&args)
|
.args(&args)
|
||||||
.env("RUSTC", path)
|
.env("RUSTC", path)
|
||||||
.spawn().expect("could not run cargo")
|
.spawn().expect("could not run cargo")
|
||||||
.wait().expect("failed to wait for cargo?")
|
.wait().expect("failed to wait for cargo?");
|
||||||
.success();
|
|
||||||
assert!(run, "cargo rustc failed");
|
|
||||||
} else {
|
} else {
|
||||||
let args: Vec<String> = if env::args().any(|s| s == "--sysroot") {
|
let args: Vec<String> = if env::args().any(|s| s == "--sysroot") {
|
||||||
env::args().collect()
|
env::args().collect()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue