Skip to content

Replace try_opt macro with ? #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nabijaczleweli merged 1 commit into from
Aug 25, 2018
Merged

Replace try_opt macro with ? #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions src/windows_msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@ use winreg::enums::*;
use std::{env, fs};
use winreg;

macro_rules! try_opt {
($opt:expr) => {
if let Some(o) = $opt {
o
} else {
return None;
}
}
}

pub const SUPPORTED: bool = true;

#[derive(Clone, Copy, Eq, PartialEq)]
Expand Down Expand Up @@ -69,12 +59,12 @@ fn find_latest_windows_sdk_rc_exe(arch: Arch) -> Option<PathBuf> {

// Windows 10 with subdir support
fn find_windows_10_kits_rc_exe(key: &str, arch: Arch) -> Option<PathBuf> {
let root_dir = try_opt!(winreg::RegKey::predef(HKEY_LOCAL_MACHINE)
let root_dir = (winreg::RegKey::predef(HKEY_LOCAL_MACHINE)
.open_subkey_with_flags(r"SOFTWARE\Microsoft\Windows Kits\Installed Roots", KEY_QUERY_VALUE)
.and_then(|reg_key| reg_key.get_value::<String, _>(key))
.ok()) + "/bin";
.ok())? + "/bin";

for entry in try_opt!(fs::read_dir(&root_dir).ok()).filter(|d| d.is_ok()).map(Result::unwrap) {
for entry in fs::read_dir(&root_dir).ok()?.filter(|d| d.is_ok()).map(Result::unwrap) {
let fname = entry.file_name().into_string();
let ftype = entry.file_type();
if fname.is_err() || ftype.is_err() || ftype.unwrap().is_file() {
Expand Down