Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26975 - servo:jdm-patch-44, r=gterzian

Browse source 
Fix refcell_backtrace feature.

This makes the output of a borrow error contain the expected list of conflicting borrows. Fixes #26971.
This commit is contained in:
bors-servo 2020-06-19 00:37:22 -04:00 • committed by GitHub
commit 1527afff17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/bindings/cell.rs
View file

@ -75,8 +75,7 @@ impl<T> DomRefCell<T> {
///
/// Panics if the value is currently mutably borrowed.
pub fn borrow(&self) -> Ref<T> {
self.try_borrow()
.expect("DomRefCell<T> already mutably borrowed")
self.value.borrow()
}
/// Mutably borrows the wrapped value.
@ -90,8 +89,7 @@ impl<T> DomRefCell<T> {
///
/// Panics if the value is currently borrowed.
pub fn borrow_mut(&self) -> RefMut<T> {
self.try_borrow_mut()
.expect("DomRefCell<T> already borrowed")
self.value.borrow_mut()
}
/// Attempts to immutably borrow the wrapped value.