merge from main

This commit is contained in:
Shunsuke Shibayama 2023-05-28 10:11:37 +09:00
parent e881703554
commit 6b8e7314f2
6 changed files with 41 additions and 14 deletions

View file

@ -198,11 +198,13 @@ impl<T: ?Sized> Shared<T> {
{
*self.borrowed_at.try_write().unwrap() = Some(std::panic::Location::caller());
}
self.data.try_read().unwrap_or_else(|| {
self.data.try_read().unwrap_or_else(|| if cfg!(feature = "debug") {
panic!(
"Shared::borrow: already borrowed at {}",
self.borrowed_at.read().as_ref().unwrap()
)
} else {
panic!("Shared::borrow: already borrowed")
})
}
@ -213,11 +215,13 @@ impl<T: ?Sized> Shared<T> {
{
*self.borrowed_at.try_write().unwrap() = Some(std::panic::Location::caller());
}
self.data.try_write().unwrap_or_else(|| {
self.data.try_write().unwrap_or_else(|| if cfg!(feature = "debug") {
panic!(
"Shared::borrow_mut: already borrowed at {}",
self.borrowed_at.read().as_ref().unwrap()
)
} else {
panic!("Shared::borrow_mut: already borrowed")
})
}