rm spinlock (unicode-org#4076)

Author: robertbastian

experimental/transliterate/src/compile/mod.rs

@@ -8,6 +8,7 @@ use alloc::collections::BTreeMap;
 use alloc::format;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
+use core::cell::RefCell;
 use icu_locid::Locale;
 use icu_normalizer::provider::*;
 use icu_properties::{provider::*, sets, PropertiesError};
@@ -17,7 +18,6 @@ mod parse;
 mod pass1;
 mod pass2;
 mod rule_group_agg;
-mod spin_lock;
 
 /// The direction of a rule-based transliterator in respect to its source.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -93,7 +93,7 @@ impl Direction {
 pub struct RuleCollection {
     id_mapping: BTreeMap<String, Locale>, // alias -> bcp id
     // these two maps need to lock together
-    data: spin_lock::SpinLock<(
+    data: RefCell<(
         BTreeMap<String, (String, bool, bool)>, // locale -> source/reverse/visible
         BTreeMap<String, Result<DataResponse<TransliteratorRulesV1Marker>, DataError>>, // cache
     )>,
@@ -109,7 +109,7 @@ impl RuleCollection {
         reverse: bool,
         visible: bool,
     ) {
-        self.data.get_mut().0.insert(
+        self.data.borrow_mut().0.insert(
             crate::ids::bcp47_to_data_locale(id).to_string(),
             (source, reverse, visible),
         );
@@ -306,7 +306,7 @@ where
     ) -> Result<DataResponse<TransliteratorRulesV1Marker>, DataError> {
         let locale = req.locale.to_string();
 
-        let mut exclusive_data = self.collection.data.lock();
+        let mut exclusive_data = self.collection.data.borrow_mut();
 
         if let Some(response) = exclusive_data.1.get(&locale) {
             return response.clone();
@@ -455,7 +455,7 @@ where
     NP: ?Sized,
 {
     fn supported_locales(&self) -> Result<Vec<DataLocale>, DataError> {
-        let exclusive_data = self.collection.data.lock();
+        let exclusive_data = self.collection.data.borrow();
         #[allow(clippy::unwrap_used)] // the maps' keys are valid DataLocales
         Ok(exclusive_data
             .0

experimental/transliterate/src/compile/spin_lock.rs

@@ -18,6 +18,7 @@ use once_cell::sync::OnceCell;
 use std::collections::HashSet;
 use std::fmt::Debug;
 use std::str::FromStr;
+use std::sync::Mutex;
 
 #[derive(Debug)]
 pub(crate) struct CldrCache {
@@ -26,7 +27,7 @@ pub(crate) struct CldrCache {
     locale_expander: OnceCell<LocaleExpander>,
     #[cfg(feature = "icu_transliterate")]
     // used by transforms/mod.rs
-    pub(super) transforms: OnceCell<icu_transliterate::RuleCollection>,
+    pub(super) transforms: OnceCell<Mutex<icu_transliterate::RuleCollection>>,
 }
 
 impl CldrCache {

provider/datagen/src/transform/cldr/source.rs

@@ -9,9 +9,10 @@ use icu_provider::datagen::IterableDataProvider;
 use icu_provider::prelude::*;
 use icu_transliterate::provider::*;
 use icu_transliterate::RuleCollection;
+use std::sync::Mutex;
 
 impl CldrCache {
-    fn transforms(&self) -> Result<&RuleCollection, DataError> {
+    fn transforms(&self) -> Result<&Mutex<RuleCollection>, DataError> {
         self.transforms.get_or_try_init(|| {
             fn find_bcp47(aliases: &[transforms::TransformAlias]) -> Option<&Locale> {
                 aliases
@@ -105,7 +106,7 @@ impl CldrCache {
                     }
                 }
             }
-            Ok(provider)
+            Ok(Mutex::new(provider))
         })
     }
 }
@@ -118,6 +119,8 @@ impl DataProvider<TransliteratorRulesV1Marker> for crate::DatagenProvider {
         self.check_req::<TransliteratorRulesV1Marker>(req)?;
         self.cldr()?
             .transforms()?
+            .lock()
+            .expect("poison")
             .as_provider_unstable(self, self)?
             .load(req)
     }
@@ -127,6 +130,8 @@ impl IterableDataProvider<TransliteratorRulesV1Marker> for crate::DatagenProvide
     fn supported_locales(&self) -> Result<Vec<DataLocale>, DataError> {
         self.cldr()?
             .transforms()?
+            .lock()
+            .expect("poison")
             .as_provider_unstable(self, self)?
             .supported_locales()
     }