Replace std::sync locks with parking_lot locks

Author: marcins

Cargo.lock

@@ -30,6 +30,7 @@ serde_json = "1.0.116"
 toml = "0.8.12"
 anyhow = "1.0.82"
 mockall = "0.12.1"
+parking_lot = "0.12"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 sentry = { version = "0.32.2", optional = true, default-features = false, features = ["backtrace", "contexts", "panic", "reqwest", "debug-images", "anyhow"]}

crates/node-bindings/Cargo.toml

@@ -1,6 +1,6 @@
+use parking_lot::Mutex;
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::sync::Mutex;
 use std::time::Duration;
 
 use napi::Error;
@@ -26,7 +26,7 @@ fn init_sentry() -> Result<(), Status> {
 
   log::info!("Initialising Sentry in rust...");
 
-  if SENTRY_GUARD.lock().unwrap().is_some() {
+  if SENTRY_GUARD.lock().is_some() {
     return Err(Error::from_reason(
       "Sentry guard already set, should only initialise Sentry once.",
     ));
@@ -63,7 +63,7 @@ fn init_sentry() -> Result<(), Status> {
 
   let guard = init((sentry_dsn, sentry_client_options));
 
-  SENTRY_GUARD.lock().unwrap().replace(guard);
+  SENTRY_GUARD.lock().replace(guard);
 
   sentry::configure_scope(|scope| {
     scope.set_user(Some(sentry::User {
@@ -81,7 +81,7 @@ fn init_sentry() -> Result<(), Status> {
 
 #[napi]
 fn close_sentry() {
-  if let Some(guard) = SENTRY_GUARD.lock().unwrap().take() {
+  if let Some(guard) = SENTRY_GUARD.lock().take() {
     guard.close(Some(TIMEOUT));
   }
 }

crates/node-bindings/src/init_sentry/sentry.rs

@@ -37,3 +37,4 @@ pathdiff = "0.2.0"
 path-slash = "0.1.4"
 indexmap = "1.9.2"
 parcel-macros = { path = "../../../../crates/macros" }
+parking_lot = "0.12"

packages/transformers/js/core/Cargo.toml

@@ -409,19 +409,21 @@ macro_rules! id {
 }
 
 #[derive(Debug, Clone, Default)]
-pub struct ErrorBuffer(std::sync::Arc<std::sync::Mutex<Vec<swc_core::common::errors::Diagnostic>>>);
+pub struct ErrorBuffer(
+  std::sync::Arc<parking_lot::Mutex<Vec<swc_core::common::errors::Diagnostic>>>,
+);
 
 impl Emitter for ErrorBuffer {
   fn emit(&mut self, db: &DiagnosticBuilder) {
-    self.0.lock().unwrap().push((**db).clone());
+    self.0.lock().push((**db).clone());
   }
 }
 
 pub fn error_buffer_to_diagnostics(
   error_buffer: &ErrorBuffer,
   source_map: &SourceMap,
 ) -> Vec<Diagnostic> {
-  let s = error_buffer.0.lock().unwrap().clone();
+  let s = error_buffer.0.lock().clone();
   s.iter()
     .map(|diagnostic| {
       let message = diagnostic.message();

packages/transformers/js/core/src/utils.rs

@@ -20,6 +20,7 @@ elsa = "1.7.0"
 once_cell = "1.17.0"
 glob-match = "0.2.1"
 dashmap = "5.4.0"
+parking_lot = "0.12"
 
 [dev-dependencies]
 assert_fs = "1.0"

packages/utils/node-resolver-rs/Cargo.toml

@@ -2,11 +2,11 @@ use std::borrow::Cow;
 use std::ops::Deref;
 use std::path::Path;
 use std::path::PathBuf;
-use std::sync::Mutex;
 
 use dashmap::DashMap;
 use elsa::sync::FrozenMap;
 use parcel_filesystem::FileSystem;
+use parking_lot::Mutex;
 use typed_arena::Arena;
 
 use crate::package_json::PackageJson;
@@ -193,7 +193,7 @@ fn read<F: FileSystem>(
   arena: &Mutex<Arena<Box<str>>>,
   path: &Path,
 ) -> std::io::Result<&'static mut str> {
-  let arena = arena.lock().unwrap();
+  let arena = arena.lock();
   let data = arena.alloc(fs.read_to_string(path)?.into_boxed_str());
   // The data lives as long as the arena. In public methods, we only vend temporary references.
   Ok(unsafe { &mut *(&mut **data as *mut str) })