Make Parallel<T>
more T: !Default
accessible (#17943)
# Objective `ThreadLocal::<T>::default()` doesn't require `T: Default`, so `Parallel<T>` shouldn't require it either. ## Solution - Replaced the `Default` derive with a manually specified impl. - Added `Parallel::borrow_local_mut_or` as a non-`T: Default`-requiring alternative to `borrow_local_mut`. - Added `Parallel::scope_or` as a non-`T: Default`-requiring alternative to `scope`.
This commit is contained in:
parent
2342e993ec
commit
fb5d8fd867
@ -5,7 +5,6 @@ use thread_local::ThreadLocal;
|
|||||||
/// A cohesive set of thread-local values of a given type.
|
/// A cohesive set of thread-local values of a given type.
|
||||||
///
|
///
|
||||||
/// Mutable references can be fetched if `T: Default` via [`Parallel::scope`].
|
/// Mutable references can be fetched if `T: Default` via [`Parallel::scope`].
|
||||||
#[derive(Default)]
|
|
||||||
pub struct Parallel<T: Send> {
|
pub struct Parallel<T: Send> {
|
||||||
locals: ThreadLocal<RefCell<T>>,
|
locals: ThreadLocal<RefCell<T>>,
|
||||||
}
|
}
|
||||||
@ -20,6 +19,25 @@ impl<T: Send> Parallel<T> {
|
|||||||
pub fn clear(&mut self) {
|
pub fn clear(&mut self) {
|
||||||
self.locals.clear();
|
self.locals.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Retrieves the thread-local value for the current thread and runs `f` on it.
|
||||||
|
///
|
||||||
|
/// If there is no thread-local value, it will be initialized to the result
|
||||||
|
/// of `create`.
|
||||||
|
pub fn scope_or<R>(&self, create: impl FnOnce() -> T, f: impl FnOnce(&mut T) -> R) -> R {
|
||||||
|
f(&mut self.borrow_local_mut_or(create))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Mutably borrows the thread-local value.
|
||||||
|
///
|
||||||
|
/// If there is no thread-local value, it will be initialized to the result
|
||||||
|
/// of `create`.
|
||||||
|
pub fn borrow_local_mut_or(
|
||||||
|
&self,
|
||||||
|
create: impl FnOnce() -> T,
|
||||||
|
) -> impl DerefMut<Target = T> + '_ {
|
||||||
|
self.locals.get_or(|| RefCell::new(create())).borrow_mut()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T: Default + Send> Parallel<T> {
|
impl<T: Default + Send> Parallel<T> {
|
||||||
@ -27,15 +45,14 @@ impl<T: Default + Send> Parallel<T> {
|
|||||||
///
|
///
|
||||||
/// If there is no thread-local value, it will be initialized to its default.
|
/// If there is no thread-local value, it will be initialized to its default.
|
||||||
pub fn scope<R>(&self, f: impl FnOnce(&mut T) -> R) -> R {
|
pub fn scope<R>(&self, f: impl FnOnce(&mut T) -> R) -> R {
|
||||||
let mut cell = self.locals.get_or_default().borrow_mut();
|
self.scope_or(Default::default, f)
|
||||||
f(cell.deref_mut())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Mutably borrows the thread-local value.
|
/// Mutably borrows the thread-local value.
|
||||||
///
|
///
|
||||||
/// If there is no thread-local value, it will be initialized to its default.
|
/// If there is no thread-local value, it will be initialized to its default.
|
||||||
pub fn borrow_local_mut(&self) -> impl DerefMut<Target = T> + '_ {
|
pub fn borrow_local_mut(&self) -> impl DerefMut<Target = T> + '_ {
|
||||||
self.locals.get_or_default().borrow_mut()
|
self.borrow_local_mut_or(Default::default)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,3 +89,12 @@ impl<T: Send> Parallel<Vec<T>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// `Default` is manually implemented to avoid the `T: Default` bound.
|
||||||
|
impl<T: Send> Default for Parallel<T> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
locals: ThreadLocal::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user