Merge pull request #187 from migerh/replace-std-rwlock

Replace std::sync::RwLock with parking_lot

Author: ashleygwilliams

Cargo.lock

@@ -14,6 +14,7 @@ failure = "0.1.1"
 human-panic = "1.0.0"
 indicatif = "0.9.0"
 lazy_static = "1.0.0"
+parking_lot = "0.6"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -6,7 +6,7 @@ use PBAR;
 
 pub fn cargo_install_wasm_bindgen(step: &Step) -> Result<(), Error> {
     let msg = format!("{}Installing WASM-bindgen...", emoji::DOWN_ARROW);
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     let output = Command::new("cargo")
         .arg("install")
         .arg("wasm-bindgen-cli")
@@ -15,7 +15,7 @@ pub fn cargo_install_wasm_bindgen(step: &Step) -> Result<(), Error> {
     if !output.status.success() {
         let s = String::from_utf8_lossy(&output.stderr);
         if s.contains("already exists") {
-            PBAR.info("wasm-bindgen already installed")?;
+            PBAR.info("wasm-bindgen already installed");
             return Ok(());
         }
         Error::cli("Installing wasm-bindgen failed", s)
@@ -33,7 +33,7 @@ pub fn wasm_bindgen_build(
     step: &Step,
 ) -> Result<(), Error> {
     let msg = format!("{}Running WASM-bindgen...", emoji::RUNNER);
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     let binary_name = name.replace("-", "_");
     let release_or_debug = if debug { "debug" } else { "release" };
     let wasm_path = format!(

src/bindgen.rs

@@ -6,7 +6,7 @@ use PBAR;
 
 pub fn rustup_add_wasm_target(step: &Step) -> Result<(), Error> {
     let msg = format!("{}Adding WASM target...", emoji::TARGET);
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     ensure_nightly()?;
     let output = Command::new("rustup")
         .arg("target")
@@ -41,7 +41,7 @@ fn ensure_nightly() -> Result<(), Error> {
 
 pub fn cargo_build_wasm(path: &str, debug: bool, step: &Step) -> Result<(), Error> {
     let msg = format!("{}Compiling to WASM...", emoji::CYCLONE);
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     let output = {
         let mut cmd = Command::new("cargo");
         cmd.current_dir(path).arg("+nightly").arg("build");

src/build.rs

@@ -17,7 +17,7 @@ use PBAR;
 // the correct type here.
 pub fn create_pkg_dir(path: &str, step: &Step) -> result::Result<(), Error> {
     let msg = format!("{}Creating a pkg directory...", emoji::FOLDER);
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     let pkg_dir_path = format!("{}/pkg", path);
     fs::create_dir_all(pkg_dir_path)?;
     Ok(())
@@ -114,13 +114,13 @@ impl Init {
             "Your WASM pkg is ready to publish at {}/pkg.", &self.crate_path
         );
 
-        PBAR.message(&format!("{} Done in {}", emoji::SPARKLE, &duration))?;
+        PBAR.message(&format!("{} Done in {}", emoji::SPARKLE, &duration));
 
         PBAR.message(&format!(
             "{} Your WASM pkg is ready to publish at {}/pkg.",
             emoji::PACKAGE,
             &self.crate_path
-        ))?;
+        ));
         Ok(())
     }
 

src/command/init.rs

@@ -26,6 +26,6 @@ pub fn login(
     npm::npm_login(&registry, &scope, always_auth, &auth_type)?;
     info!(&log, "Logged you in!");
 
-    PBAR.message(&format!("👋  logged you in!"))?;
+    PBAR.message(&format!("👋  logged you in!"));
     Ok(())
 }

src/command/login.rs

@@ -146,7 +146,7 @@ pub fn run_wasm_pack(command: Command, log: &Logger) -> result::Result<(), Error
         Ok(_) => {}
         Err(ref e) => {
             error!(&log, "{}", e);
-            PBAR.error(e.error_type())?;
+            PBAR.error(e.error_type());
         }
     }
 

src/command/mod.rs

@@ -15,6 +15,6 @@ pub fn pack(path: Option<String>, log: &Logger) -> result::Result<(), Error> {
     #[cfg(target_os = "windows")]
     info!(&log, "Your package is located at {}\\pkg", &crate_path);
 
-    PBAR.message("🎒  packed up your package!")?;
+    PBAR.message("🎒  packed up your package!");
     Ok(())
 }

src/command/pack.rs

@@ -13,6 +13,6 @@ pub fn publish(path: Option<String>, log: &Logger) -> result::Result<(), Error>
     npm::npm_publish(&crate_path)?;
     info!(&log, "Published your package!");
 
-    PBAR.message("💥  published your package!")?;
+    PBAR.message("💥  published your package!");
     Ok(())
 }

src/command/publish.rs

@@ -2,7 +2,6 @@
 use serde_json;
 use std::borrow::Cow;
 use std::io;
-use std::sync::PoisonError;
 use toml;
 
 #[derive(Debug, Fail)]
@@ -14,8 +13,6 @@ pub enum Error {
     SerdeJson(#[cause] serde_json::Error),
     #[fail(display = "{}", _0)]
     SerdeToml(#[cause] toml::de::Error),
-    #[fail(display = "Acquiring lock failed")]
-    PoisonedLockError,
     #[fail(display = "{}. stderr:\n\n{}", message, stderr)]
     Cli { message: String, stderr: String },
     #[fail(display = "{}", message)]
@@ -41,7 +38,6 @@ impl Error {
             Error::Io(_) => "There was an I/O error. Details:\n\n",
             Error::SerdeJson(_) => "There was an JSON error. Details:\n\n",
             Error::SerdeToml(_) => "There was an TOML error. Details:\n\n",
-            Error::PoisonedLockError => "There was an RwLock error. Details: \n\n",
             Error::Cli {
                 message: _,
                 stderr: _,
@@ -70,9 +66,3 @@ impl From<toml::de::Error> for Error {
         Error::SerdeToml(e)
     }
 }
-
-impl<T> From<PoisonError<T>> for Error {
-    fn from(_: PoisonError<T>) -> Self {
-        Error::PoisonedLockError
-    }
-}

src/error.rs

@@ -4,6 +4,7 @@ extern crate failure;
 extern crate indicatif;
 #[macro_use]
 extern crate lazy_static;
+extern crate parking_lot;
 #[macro_use]
 extern crate serde_derive;
 extern crate serde_json;

src/lib.rs

@@ -123,20 +123,20 @@ pub fn write_package_json(
         )
     };
 
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     let pkg_file_path = format!("{}/pkg/package.json", path);
     let mut pkg_file = File::create(pkg_file_path)?;
     let crate_data = read_cargo_toml(path)?;
     let npm_data = crate_data.into_npm(scope, disable_dts);
 
     if npm_data.description.is_none() {
-        PBAR.warn(&warn_fmt("description"))?;
+        PBAR.warn(&warn_fmt("description"));
     }
     if npm_data.repository.is_none() {
-        PBAR.warn(&warn_fmt("repository"))?;
+        PBAR.warn(&warn_fmt("repository"));
     }
     if npm_data.license.is_none() {
-        PBAR.warn(&warn_fmt("license"))?;
+        PBAR.warn(&warn_fmt("license"));
     }
 
     let npm_json = serde_json::to_string_pretty(&npm_data)?;
@@ -150,7 +150,7 @@ pub fn get_crate_name(path: &str) -> Result<String, Error> {
 
 pub fn check_crate_config(path: &str, step: &Step) -> Result<(), Error> {
     let msg = format!("{}Checking crate configuration...", emoji::WRENCH);
-    PBAR.step(&step, &msg)?;
+    PBAR.step(&step, &msg);
     check_wasm_bindgen(path)?;
     check_crate_type(path)?;
     Ok(())

src/manifest.rs

@@ -1,9 +1,8 @@
 use console::style;
 use emoji;
-use error::Error;
 use indicatif::{ProgressBar, ProgressStyle};
+use parking_lot::RwLock;
 use std::fmt;
-use std::sync::RwLock;
 
 pub struct ProgressOutput {
     spinner: RwLock<ProgressBar>,
@@ -18,73 +17,62 @@ impl ProgressOutput {
         }
     }
 
-    pub fn step(&self, step: &Step, message: &str) -> Result<(), Error> {
+    pub fn step(&self, step: &Step, message: &str) {
         let msg = format!("{} {}", style(step).bold().dim(), message);
         self.message(&msg)
     }
 
-    fn finish(&self) -> Result<(), Error> {
-        let spinner = self.spinner.read()?;
+    fn finish(&self) {
+        let spinner = self.spinner.read();
         spinner.finish();
 
-        let mut message = self.messages.write()?;
-        print!("{}", message);
+        let mut message = self.messages.write();
+        print!("{}", *message);
         message.clear();
-
-        Ok(())
     }
 
-    pub fn message(&self, message: &str) -> Result<(), Error> {
-        self.finish()?;
+    pub fn message(&self, message: &str) {
+        self.finish();
 
-        let mut spinner = self.spinner.write()?;
+        let mut spinner = self.spinner.write();
         *spinner = Self::progressbar(message);
-        Ok(())
     }
 
-    fn add_message(&self, msg: &str) -> Result<(), Error> {
-        let mut message = self.messages.write()?;
+    fn add_message(&self, msg: &str) {
+        let mut message = self.messages.write();
         message.push_str("  ");
         message.push_str(msg);
         message.push('\n');
-
-        Ok(())
     }
 
-    pub fn info(&self, message: &str) -> Result<(), Error> {
+    pub fn info(&self, message: &str) {
         let info = format!(
             "{} {}: {}",
             emoji::INFO,
             style("[INFO]").bold().dim(),
             message
         );
-        self.add_message(&info)?;
-
-        Ok(())
+        self.add_message(&info);
     }
 
-    pub fn warn(&self, message: &str) -> Result<(), Error> {
+    pub fn warn(&self, message: &str) {
         let warn = format!(
             "{} {}: {}",
             emoji::WARN,
             style("[WARN]").bold().dim(),
             message
         );
-        self.add_message(&warn)?;
-
-        Ok(())
+        self.add_message(&warn);
     }
 
-    pub fn error(&self, message: String) -> Result<(), Error> {
+    pub fn error(&self, message: String) {
         let err = format!(
             "{} {}: {}",
             emoji::ERROR,
             style("[ERR]").bold().dim(),
             message
         );
-        self.add_message(&err)?;
-
-        Ok(())
+        self.add_message(&err);
     }
 
     fn progressbar(msg: &str) -> ProgressBar {
@@ -99,9 +87,8 @@ impl ProgressOutput {
         pb
     }
 
-    pub fn done(&self) -> Result<(), Error> {
-        self.finish()?;
-        Ok(())
+    pub fn done(&self) {
+        self.finish();
     }
 }
 
@@ -127,6 +114,6 @@ impl fmt::Display for Step {
 
 impl Drop for ProgressOutput {
     fn drop(&mut self) {
-        self.done().unwrap();
+        self.done();
     }
 }

src/progressbar.rs

@@ -7,11 +7,11 @@ use PBAR;
 
 pub fn copy_from_crate(path: &str, step: &Step) -> Result<(), Error> {
     let msg = format!("{}Copying over your README...", emoji::DANCERS);
-    PBAR.step(step, &msg)?;
+    PBAR.step(step, &msg);
     let crate_readme_path = format!("{}/README.md", path);
     let new_readme_path = format!("{}/pkg/README.md", path);
     if let Err(_) = fs::copy(&crate_readme_path, &new_readme_path) {
-        PBAR.warn("origin crate has no README")?;
+        PBAR.warn("origin crate has no README");
     };
     Ok(())
 }