From 933b74781bf203a836330a850b2bbd12b02a83c8 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 10 Jan 2017 17:35:50 +0100 Subject: [PATCH] Use usize for AutoEntryScript::global. --- components/script/dom/bindings/settings_stack.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/script/dom/bindings/settings_stack.rs b/components/script/dom/bindings/settings_stack.rs index 2b24800cebc..df4759d677a 100644 --- a/components/script/dom/bindings/settings_stack.rs +++ b/components/script/dom/bindings/settings_stack.rs @@ -25,7 +25,7 @@ pub unsafe fn trace(tracer: *mut JSTracer) { /// RAII struct that pushes and pops entries from the script settings stack. pub struct AutoEntryScript { - global: *const GlobalScope, + global: usize, } impl AutoEntryScript { @@ -38,7 +38,7 @@ impl AutoEntryScript { global: JS::from_ref(global), }); AutoEntryScript { - global: global as *const _, + global: global as *const _ as usize, } }) } @@ -50,10 +50,10 @@ impl Drop for AutoEntryScript { STACK.with(|stack| { let mut stack = stack.borrow_mut(); let entry = stack.pop().unwrap(); - assert_eq!(&*entry.global as *const GlobalScope, + assert_eq!(&*entry.global as *const GlobalScope as usize, self.global, "Dropped AutoEntryScript out of order."); - trace!("Clean up after running script with {:p}", self.global); + trace!("Clean up after running script with {:p}", &*entry.global); }) } }