Skip to content

Commit 01d64a5

Browse files
committed
chore: Remove unnecessary calls to drop()
This patch removes calls to drop() when they are not necessary or there are betters ways to handle the scope of the variable.
1 parent d20376a commit 01d64a5

File tree

8 files changed

+9
-24
lines changed

8 files changed

+9
-24
lines changed

core/src/avm2/events.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,11 +444,9 @@ pub fn dispatch_event<'gc>(
444444
parent = parent_dobj.parent();
445445
}
446446

447-
let mut evtmut = event.event_mut(activation.gc());
448-
449-
evtmut.set_phase(EventPhase::Capturing);
450-
451-
drop(evtmut);
447+
event
448+
.event_mut(activation.gc())
449+
.set_phase(EventPhase::Capturing);
452450

453451
for ancestor in ancestor_list.iter().rev() {
454452
if event.event().is_propagation_stopped() {

core/src/avm2/object/xml_list_object.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -839,10 +839,8 @@ impl<'gc> TObject<'gc> for XmlListObject<'gc> {
839839
value = value.coerce_to_string(activation)?.into();
840840
}
841841

842-
// NOTE: Get x[i] for future operations. Also we need to drop ref to the children as we need to borrow as mutable later.
843-
let children = self.children();
844-
let child = children[index].node();
845-
drop(children);
842+
// NOTE: Get x[i] for future operations.
843+
let child = self.children()[index].node();
846844

847845
// 2.e. If x[i].[[Class]] == "attribute"
848846
if child.is_attribute() {

core/src/display_object/container.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,8 @@ pub trait TDisplayObjectContainer<'gc>:
369369
fn remove_child_directly(&self, context: &mut UpdateContext<'gc>, child: DisplayObject<'gc>) {
370370
dispatch_removed_event(child, context);
371371
let this: DisplayObjectContainer<'gc> = *self;
372-
let mut write = self.raw_container_mut(context.gc());
373-
write.remove_child_from_depth_list(child);
374-
drop(write);
372+
self.raw_container_mut(context.gc())
373+
.remove_child_from_depth_list(child);
375374

376375
let removed_from_render_list =
377376
ChildContainer::remove_child_from_render_list(this, child, context);
@@ -447,14 +446,12 @@ pub trait TDisplayObjectContainer<'gc>:
447446
dispatch_removed_event(*removed, context);
448447
}
449448

450-
let mut write = self.raw_container_mut(context.gc());
451-
452449
for removed in removed_list {
453450
// The `remove_range` method is only ever called as a result of an ActionScript
454451
// call
455452
removed.set_placed_by_script(true);
456-
write.remove_child_from_depth_list(removed);
457-
drop(write);
453+
self.raw_container_mut(context.gc())
454+
.remove_child_from_depth_list(removed);
458455

459456
let this: DisplayObjectContainer<'gc> = *self;
460457
ChildContainer::remove_child_from_render_list(this, removed, context);
@@ -464,11 +461,8 @@ pub trait TDisplayObjectContainer<'gc>:
464461
} else if removed.object2().is_some() {
465462
removed.set_parent(context, None);
466463
}
467-
468-
write = self.raw_container_mut(context.gc());
469464
}
470465

471-
drop(write);
472466
let this: DisplayObject<'_> = (*self).into();
473467
this.invalidate_cached_bitmap();
474468
}

render/wgpu/src/filters/bevel.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ impl BevelFilter {
290290
wgpu::IndexFormat::Uint32,
291291
);
292292
render_pass.draw_indexed(0..6, 0, 0..1);
293-
drop(render_pass);
294293
target
295294
}
296295
}

render/wgpu/src/filters/color_matrix.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ impl ColorMatrixFilter {
209209
wgpu::IndexFormat::Uint32,
210210
);
211211
render_pass.draw_indexed(0..6, 0, 0..1);
212-
drop(render_pass);
213212
target
214213
}
215214
}

render/wgpu/src/filters/displacement_map.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ impl DisplacementMapFilter {
283283
wgpu::IndexFormat::Uint32,
284284
);
285285
render_pass.draw_indexed(0..6, 0, 0..1);
286-
drop(render_pass);
287286
Some(target)
288287
}
289288
}

render/wgpu/src/filters/glow.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ impl GlowFilter {
267267
wgpu::IndexFormat::Uint32,
268268
);
269269
render_pass.draw_indexed(0..6, 0, 0..1);
270-
drop(render_pass);
271270
target
272271
}
273272
}

render/wgpu/src/surface.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ impl Surface {
338338
);
339339

340340
render_pass.draw_indexed(0..6, 0, 0..1);
341-
drop(render_pass);
342341
}
343342
}
344343
}

0 commit comments

Comments
 (0)