Fix recycling on component callbacks (#2247)

This commit is contained in:
Jonathan Kelley 2024-04-04 16:48:06 -07:00 committed by GitHub
parent 0a3291084f
commit 702509cb7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions

View file

@ -157,7 +157,7 @@ impl Drop for VNode {
for attrs in self.vnode.dynamic_attrs.iter() {
for attr in attrs.iter() {
if let AttributeValue::Listener(listener) = &attr.value {
listener.callback.manually_drop();
listener.callback.recycle();
}
}
}

View file

@ -198,12 +198,17 @@ impl<T, S: Storage<T>> GenerationalBox<T, S> {
}
}
/// Drop the value out of the generational box and invalidate the generational box. This will return the value if the value was taken.
/// Recycle the generationalbox, dropping the value.
pub fn recycle(&self) {
_ = Storage::take(&self.raw.0.data);
<S as AnyStorage>::recycle(&self.raw);
}
/// Drop the value out of the generational box and invalidate the generational box.
/// This will return the value if the value was taken.
pub fn manually_drop(&self) -> Option<T> {
if self.validate() {
let o = Storage::take(&self.raw.0.data);
<S as AnyStorage>::recycle(&self.raw);
o
Storage::take(&self.raw.0.data)
} else {
None
}