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

Replace Rc<RefCell<Option<RootedTraceableBox<Heap<JSVal>>>>> with Rc<RefCell<Option<Heap<JSVal>>>> in PipeTo::shutdown_error (#38562)

Browse source 
#38024 adds a rooted box around the Heap for safety, but this is not
necessary anymore after #38385. The solution is to replace
`Rc<RefCell<Option<RootedTraceableBox<Heap<JSVal>>>>>` with
`Rc<RefCell<Option<Heap<JSVal>>>>`. This changes replaces this type.

Signed-off-by: amotaouakkil123 <adam.motaouakkil@mail.mcgill.ca>
This commit is contained in:
Adam 2025-08-11 04:58:54 -04:00 • committed by GitHub
parent 3ab56b16de
commit 6ddcce4889
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/readablestream.rs
View file

@ -154,7 +154,7 @@ pub(crate) struct PipeTo {
/// The error potentially passed to shutdown, /// The error potentially passed to shutdown,
/// stored here because we must keep it across a microtask. /// stored here because we must keep it across a microtask.
#[ignore_malloc_size_of = "mozjs"] #[ignore_malloc_size_of = "mozjs"]
shutdown_error: Rc<RefCell<Option<RootedTraceableBox<Heap<JSVal>>>>>, shutdown_error: Rc<RefCell<Option<Heap<JSVal>>>>,
/// The promise returned by a shutdown action. /// The promise returned by a shutdown action.
/// We keep it to only continue when it is not pending anymore. /// We keep it to only continue when it is not pending anymore.
@ -360,7 +360,7 @@ impl PipeTo {
/// Setting shutdown error in a way that ensures it isn't /// Setting shutdown error in a way that ensures it isn't
/// moved after it has been set. /// moved after it has been set.
fn set_shutdown_error(&self, error: SafeHandleValue) { fn set_shutdown_error(&self, error: SafeHandleValue) {
*self.shutdown_error.borrow_mut() = Some(RootedTraceableBox::new(Heap::default())); *self.shutdown_error.borrow_mut() = Some(Heap::default());
let Some(ref heap) = *self.shutdown_error.borrow() else { let Some(ref heap) = *self.shutdown_error.borrow() else {
unreachable!("Option set to Some(heap) above."); unreachable!("Option set to Some(heap) above.");
}; };