Fix getting the target-dir in wasm_bindgen_build

Fixes #1278
master
Tomas Olvecky 2 years ago
parent 3073db8f18
commit 75e61d4ce2
  1. 15
      src/bindgen.rs

@ -29,17 +29,14 @@ pub fn wasm_bindgen_build(
}; };
let out_dir = out_dir.to_str().unwrap(); let out_dir = out_dir.to_str().unwrap();
let has_target_dir_overwrite = extra_options.contains(&"--target-dir".to_string());
let target_directory = if has_target_dir_overwrite { let target_directory = {
let i = extra_options let mut has_target_dir_iter = extra_options.iter();
.binary_search(&"--target-dir".to_string()) has_target_dir_iter
.unwrap(); .find(|&it| it == "--target-dir")
extra_options .and_then(|_| has_target_dir_iter.next())
.get(i + 1)
.map(Path::new) .map(Path::new)
.unwrap_or(data.target_directory()) .unwrap_or(data.target_directory())
} else {
data.target_directory()
}; };
let wasm_path = target_directory let wasm_path = target_directory

Loading…
Cancel
Save