From f2fbe264d42e3bb52f5dcd41a7c0be7f5fe9d722 Mon Sep 17 00:00:00 2001
From: Michael Gattozzi <mgattozzi@gmail.com>
Date: Mon, 18 Jun 2018 12:45:30 -0400
Subject: [PATCH] fix(no-install): cratename should not be an option

---
 src/command/init.rs | 22 ++++++++++++----------
 src/command/mod.rs  |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/command/init.rs b/src/command/init.rs
index b227162..7ca6bce 100644
--- a/src/command/init.rs
+++ b/src/command/init.rs
@@ -35,7 +35,7 @@ pub struct Init {
     disable_dts: bool,
     target: String,
     debug: bool,
-    crate_name: Option<String>,
+    crate_name: String,
 }
 
 type InitStep = fn(&mut Init, &Step, &Logger) -> result::Result<(), Error>;
@@ -47,15 +47,17 @@ impl Init {
         disable_dts: bool,
         target: String,
         debug: bool,
-    ) -> Init {
-        Init {
-            crate_path: set_crate_path(path),
+    ) -> Result<Init, Error> {
+        let crate_path = set_crate_path(path);
+        let crate_name = manifest::get_crate_name(&crate_path)?;
+        Ok(Init {
+            crate_path,
             scope,
             disable_dts,
             target,
             debug,
-            crate_name: None,
-        }
+            crate_name
+        })
     }
 
     fn get_process_steps(mode: InitMode) -> Vec<(&'static str, InitStep)> {
@@ -202,19 +204,19 @@ impl Init {
         info!(&log, "Installing wasm-bindgen-cli was successful.");
 
         info!(&log, "Getting the crate name from the manifest...");
-        self.crate_name = Some(manifest::get_crate_name(&self.crate_path)?);
+        self.crate_name = manifest::get_crate_name(&self.crate_path)?;
         #[cfg(not(target_os = "windows"))]
         info!(
             &log,
             "Got crate name {} from the manifest at {}/Cargo.toml.",
-            &self.crate_name.as_ref().unwrap(),
+            &self.crate_name,
             &self.crate_path
         );
         #[cfg(target_os = "windows")]
         info!(
             &log,
             "Got crate name {} from the manifest at {}\\Cargo.toml.",
-            &self.crate_name.as_ref().unwrap(),
+            &self.crate_name,
             &self.crate_path
         );
         Ok(())
@@ -224,7 +226,7 @@ impl Init {
         info!(&log, "Building the wasm bindings...");
         bindgen::wasm_bindgen_build(
             &self.crate_path,
-            &self.crate_name.as_ref().unwrap(),
+            &self.crate_name,
             self.disable_dts,
             &self.target,
             self.debug,
diff --git a/src/command/mod.rs b/src/command/mod.rs
index 08abf5e..3319c8a 100644
--- a/src/command/mod.rs
+++ b/src/command/mod.rs
@@ -111,7 +111,7 @@ pub fn run_wasm_pack(command: Command, log: &Logger) -> result::Result<(), Error
                 "normal" => InitMode::Normal,
                 _ => InitMode::Normal,
             };
-            Init::new(path, scope, disable_dts, target, debug).process(&log, modetype)
+            Init::new(path, scope, disable_dts, target, debug)?.process(&log, modetype)
         }
         Command::Pack { path } => {
             info!(&log, "Running pack command...");