aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-02-23 14:51:54 -0700
committerbors-servo <metajack+bors@gmail.com>2015-02-23 14:51:54 -0700
commit9a5970cceacb40a742a3f34292ad6bf5fa56c01f (patch)
tree2d6971a3e0873bf1369d3a4a0c2c0de31a977a78
parent91abf5557b1a324d6568ce08cfb92cdffca10e41 (diff)
parent601e80fa43133b6cf0d4c10fbe651d6a4bce274f (diff)
downloadservo-9a5970cceacb40a742a3f34292ad6bf5fa56c01f.tar.gz
servo-9a5970cceacb40a742a3f34292ad6bf5fa56c01f.zip
auto merge of #5040 : Ms2ger/servo/cleanup-unroot, r=jdm
-rw-r--r--components/script/dom/bindings/js.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index 622368af6d2..b370b3a073f 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -634,11 +634,9 @@ impl RootCollection {
fn unroot<'b, T: Reflectable>(&self, rooted: &Root<T>) {
unsafe {
let roots = self.roots.get();
- debug!("unrooting {:?} (expecting {:?}",
- (*roots).as_slice().last().unwrap(),
- rooted.js_ptr);
- assert!(*(*roots).as_slice().last().unwrap() == rooted.js_ptr);
- (*roots).pop().unwrap();
+ let unrooted = (*roots).pop().unwrap();
+ debug!("unrooted {:?} (expecting {:?}", unrooted, rooted.js_ptr);
+ assert!(unrooted == rooted.js_ptr);
}
}
}