enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-25 16:53:10 +03:00
Code Issues Projects Releases Wiki Activity

Reduce borrow scope (#6359)

Browse Source 
Reduce the scope of a borrow, to prevent `BorrowError`s.
This commit is contained in:
Kaz Wesley 2023-04-19 13:33:46 -07:00 committed by GitHub
parent fe0c8fd9a3
commit dd4dce2c3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/rust/ensogl/core/src/display/scene/layer.rs
View File

@ -805,7 +805,12 @@ impl LayerModel {
/// Clear the parent field and remove the layer from its parent's sublayer list.
fn remove_from_parent(&self) {
if let Some(parent) = self.parent.borrow_mut().take() {
// Borrow `self.parent` only within the scope of this line. Note that if this expression
// were used directly as the matched expression of the `if let`, the `RefMut` would not be
// dropped until the end of the `if let` block, even though it is a temporary value within
// the subexpression with `take`.
let parent = self.parent.borrow_mut().take();
if let Some(parent) = parent {
parent.borrow_mut().remove(self.id());
// Recompute depth order, in case removing a parent resolved a cycle.
self.depth_order_dirty.set();