make POLLED_FORBIDDEN_THING thread-local

Author: Ekleog

src/factory.rs

@@ -4,7 +4,7 @@ use futures_util::{
     future::{self, Either},
     pin_mut, FutureExt,
 };
-use std::{future::Future, marker::PhantomData, sync::atomic::Ordering};
+use std::{future::Future, marker::PhantomData};
 use web_sys::{
     js_sys::{self, Function},
     wasm_bindgen::{closure::Closure, JsCast, JsValue},
@@ -145,7 +145,7 @@ impl<Err: 'static> Factory<Err> {
         pin_mut!(completion_fut);
 
         let res = future::select(upgrade_rx, completion_fut).await;
-        if unsafe_jar::POLLED_FORBIDDEN_THING.load(Ordering::Relaxed) {
+        if unsafe_jar::POLLED_FORBIDDEN_THING.get() {
             panic!("Transaction blocked without any request under way");
         }
 

src/transaction.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use futures_channel::oneshot;
 use futures_util::future::{self, Either};
-use std::{future::Future, marker::PhantomData, sync::atomic::Ordering};
+use std::{future::Future, marker::PhantomData};
 use web_sys::{
     wasm_bindgen::{JsCast, JsValue},
     IdbDatabase, IdbRequest, IdbTransaction, IdbTransactionMode,
@@ -132,7 +132,7 @@ impl<Err> TransactionBuilder<Err> {
         };
         unsafe_jar::run(t, fut);
         let res = rx.await;
-        if unsafe_jar::POLLED_FORBIDDEN_THING.load(Ordering::Relaxed) {
+        if unsafe_jar::POLLED_FORBIDDEN_THING.get() {
             panic!("Transaction blocked without any request under way");
         }
         res.expect("Transaction never completed")

src/transaction/unsafe_jar.rs

@@ -10,7 +10,6 @@ use std::{
     future::Future,
     pin::Pin,
     rc::Rc,
-    sync::atomic::{AtomicBool, Ordering},
     task::{Context, Poll},
 };
 use web_sys::{
@@ -28,7 +27,7 @@ struct State {
 }
 
 scoped_thread_local!(static CURRENT: State);
-pub(crate) static POLLED_FORBIDDEN_THING: AtomicBool = AtomicBool::new(false);
+thread_local!(pub(crate) static POLLED_FORBIDDEN_THING: Cell<bool> = Cell::new(false));
 
 fn poll_it(state: &State) {
     CURRENT.set(&state, || {
@@ -65,7 +64,7 @@ fn poll_it(state: &State) {
                     // an `await` on something other than transaction requests. Abort in order to
                     // avoid the default auto-commit behavior.
                     let _ = state.transaction.abort();
-                    POLLED_FORBIDDEN_THING.store(true, Ordering::Relaxed);
+                    POLLED_FORBIDDEN_THING.set(true);
                     panic!("Transaction blocked without any request under way");
                 }
             }