openharmony/third_party_rust_proc-macro2
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_proc-macro2 synced 2024-11-27 01:20:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use question mark on Option

Browse Source
This commit is contained in:
David Tolnay 2019-07-19 11:54:35 -07:00
parent f081412819
commit 25ae9526bc
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.rs
View File

@ -88,20 +88,10 @@ struct RustcVersion {
}
fn rustc_version() -> Option<RustcVersion> {
macro_rules! otry {
($e:expr) => {
match $e {
Some(e) => e,
None => return None,
}
};
}
let rustc = otry!(env::var_os("RUSTC"));
let output = otry!(Command::new(rustc).arg("--version").output().ok());
let version = otry!(str::from_utf8(&output.stdout).ok());
let rustc = env::var_os("RUSTC")?;
let output = Command::new(rustc).arg("--version").output().ok()?;
let version = str::from_utf8(&output.stdout).ok()?;
let nightly = version.contains("nightly");
Some(RustcVersion { nightly })
}