Optimize

.gitignore

@@ -5,5 +5,6 @@ tests/bin
 /build-installer
 docs/book
 docs/installer
+dhat-*.json
 
 .idea

Cargo.toml

@@ -17,6 +17,7 @@ binary-install = "0.1.0"
 cargo_metadata = "0.15.2"
 chrono = "0.4.23"
 console = "0.15.5"
+dhat = { version = "0.3.2", optional = true }
 dialoguer = "0.10.3"
 env_logger = { version = "0.10.0", default-features = false }
 glob = "0.3.1"
@@ -43,3 +44,5 @@ predicates = "3.0.3"
 serial_test = "2.0.0"
 tempfile = "3.3.0"
 
+[features]
+dhat-heap = ["dep:dhat"]

src/build/wasm_target.rs

@@ -57,11 +57,7 @@ pub fn check_for_wasm32_target() -> Result<()> {
     PBAR.info(&msg);
 
     // Check if wasm32 target is present, otherwise bail.
-    match check_wasm32_target() {
-        Ok(ref wasm32_check) if wasm32_check.found => Ok(()),
-        Ok(wasm32_check) => bail!("{}", wasm32_check),
-        Err(err) => Err(err),
-    }
+    check_wasm32_target()
 }
 
 /// Get rustc's sysroot as a PathBuf
@@ -97,36 +93,29 @@ fn is_wasm32_target_in_sysroot(sysroot: &Path) -> bool {
     }
 }
 
-fn check_wasm32_target() -> Result<Wasm32Check> {
+fn check_wasm32_target() -> Result<()> {
     let sysroot = get_rustc_sysroot()?;
-    let rustc_path = which::which("rustc")?;
 
     // If wasm32-unknown-unknown already exists we're ok.
     if is_wasm32_target_in_sysroot(&sysroot) {
-        Ok(Wasm32Check {
-            rustc_path,
-            sysroot,
-            found: true,
-            is_rustup: false,
-        })
+        Ok(())
     // If it doesn't exist, then we need to check if we're using rustup.
     } else {
+        let rustc_path = which::which("rustc")?;
         // If sysroot contains "rustup", then we can assume we're using rustup
         // and use rustup to add the wasm32-unknown-unknown target.
         if sysroot.to_string_lossy().contains("rustup") {
-            rustup_add_wasm_target().map(|()| Wasm32Check {
-                rustc_path,
-                sysroot,
-                found: true,
-                is_rustup: true,
-            })
+            rustup_add_wasm_target()
         } else {
-            Ok(Wasm32Check {
-                rustc_path,
-                sysroot,
-                found: false,
-                is_rustup: false,
-            })
+            bail!(
+                "{}",
+                Wasm32Check {
+                    rustc_path,
+                    sysroot,
+                    found: false,
+                    is_rustup: false,
+                }
+            );
         }
     }
 }

src/command/build.rs

@@ -7,7 +7,7 @@ use crate::command::utils::{create_pkg_dir, get_crate_path};
 use crate::emoji;
 use crate::install::{self, InstallMode, Tool};
 use crate::license;
-use crate::lockfile::Lockfile;
+use crate::lockfile;
 use crate::manifest;
 use crate::readme;
 use crate::wasm_opt;
@@ -289,11 +289,7 @@ impl Build {
         match &mode {
             InstallMode::Force => {}
             _ => {
-                steps.extend(steps![
-                    step_check_rustc_version,
-                    step_check_crate_config,
-                    step_check_for_wasm_target,
-                ]);
+                steps.extend(steps![step_check_rustc, step_check_crate_config,]);
             }
         }
 
@@ -316,7 +312,19 @@ impl Build {
         steps
     }
 
-    fn step_check_rustc_version(&mut self) -> Result<()> {
+    fn step_check_rustc(&mut self) -> Result<()> {
+        std::thread::scope(|s| {
+            for handle in [
+                s.spawn(|| self.step_check_rustc_version()),
+                s.spawn(|| self.step_check_for_wasm_target()),
+            ] {
+                handle.join().unwrap()?;
+            }
+            Ok(())
+        })
+    }
+
+    fn step_check_rustc_version(&self) -> Result<()> {
         info!("Checking rustc version...");
         let version = build::check_rustc_version()?;
         let msg = format!("rustc version is {}.", version);
@@ -331,7 +339,7 @@ impl Build {
         Ok(())
     }
 
-    fn step_check_for_wasm_target(&mut self) -> Result<()> {
+    fn step_check_for_wasm_target(&self) -> Result<()> {
         info!("Checking for wasm-target...");
         build::wasm_target::check_for_wasm32_target()?;
         info!("Checking for wasm-target was successful.");
@@ -390,8 +398,8 @@ impl Build {
 
     fn step_install_wasm_bindgen(&mut self) -> Result<()> {
         info!("Identifying wasm-bindgen dependency...");
-        let lockfile = Lockfile::new(&self.crate_data)?;
-        let bindgen_version = lockfile.require_wasm_bindgen()?;
+        let [package] = lockfile::Package::get(&self.crate_data, ["wasm-bindgen"])?;
+        let bindgen_version = package.require_version_or_suggest("dependencies", "0.2")?;
         info!("Installing wasm-bindgen-cli...");
         let bindgen = install::download_prebuilt_or_cargo_install(
             Tool::WasmBindgen,

src/command/test.rs

@@ -4,7 +4,7 @@ use crate::build;
 use crate::cache;
 use crate::command::utils::get_crate_path;
 use crate::install::{self, InstallMode, Tool};
-use crate::lockfile::Lockfile;
+use crate::lockfile;
 use crate::manifest;
 use crate::test::{self, webdriver};
 use anyhow::{bail, Result};
@@ -276,22 +276,16 @@ impl Test {
 
     fn step_install_wasm_bindgen(&mut self) -> Result<()> {
         info!("Identifying wasm-bindgen dependency...");
-        let lockfile = Lockfile::new(&self.crate_data)?;
-        let bindgen_version = lockfile.require_wasm_bindgen()?;
+        let [bindgen, bindgen_test] =
+            lockfile::Package::get(&self.crate_data, ["wasm-bindgen", "wasm-bindgen-test"])?;
+        let bindgen_version = bindgen.require_version_or_suggest("dependencies", "0.2")?;
 
         // Unlike `wasm-bindgen` and `wasm-bindgen-cli`, `wasm-bindgen-test`
         // will work with any semver compatible `wasm-bindgen-cli`, so just make
         // sure that it is depended upon, so we can run tests on
         // `wasm32-unkown-unknown`. Don't enforce that it is the same version as
         // `wasm-bindgen`.
-        if lockfile.wasm_bindgen_test_version().is_none() {
-            bail!(
-                "Ensure that you have \"{}\" as a dependency in your Cargo.toml file:\n\
-                 [dev-dependencies]\n\
-                 wasm-bindgen-test = \"0.2\"",
-                style("wasm-bindgen-test").bold().dim(),
-            )
-        }
+        bindgen_test.require_version_or_suggest("dev-dependencies", "0.2")?;
 
         let status = install::download_prebuilt_or_cargo_install(
             Tool::WasmBindgen,