Fix getting the target-dir in wasm_bindgen_build

Fixes rustwasm#1278
tomasol · Apr 29, 2023 · 0141e79 · 0141e79
1 parent 48177dc
commit 0141e79
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/bindgen.rs b/src/bindgen.rs
@@ -29,18 +29,12 @@ pub fn wasm_bindgen_build(
     };
 
     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 i = extra_options
-            .binary_search(&"--target-dir".to_string())
-            .unwrap();
-        extra_options
-            .get(i + 1)
-            .map(Path::new)
-            .unwrap_or(data.target_directory())
-    } else {
-        data.target_directory()
-    };
+    let mut has_target_dir_iter = extra_options.iter();
+    let target_directory = has_target_dir_iter
+        .find(|&it| it == "--target-dir")
+        .and_then(|_| has_target_dir_iter.next())
+        .map(Path::new)
+        .unwrap_or(data.target_directory());
 
     let wasm_path = target_directory
         .join("wasm32-unknown-unknown")