mirror of
https://github.com/erg-lang/erg.git
synced 2025-08-04 10:49:54 +00:00
merge from main
This commit is contained in:
parent
e881703554
commit
6b8e7314f2
6 changed files with 41 additions and 14 deletions
|
@ -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")
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue