aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/timers.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-04 11:03:35 -0700
committerGitHub <noreply@github.com>2016-07-04 11:03:35 -0700
commit80cb0cf8214fd52d2884724614c40cb278ee7575 (patch)
treed5d98004a84375aea65a74d594dead5a27fc2392 /components/script/timers.rs
parent36974f0746261b971c93ed7dfb9bd726675ccf69 (diff)
parentb79a7d468e99f335dce49cc48342f0cd447eb855 (diff)
downloadservo-80cb0cf8214fd52d2884724614c40cb278ee7575.tar.gz
servo-80cb0cf8214fd52d2884724614c40cb278ee7575.zip
Auto merge of #11872 - eddyb:back-to-roots, r=Ms2ger
Replace return_address usage for rooting with stack guards and convenience macros. The existing `Rooted` and `RootedVec` users were migrated the the following two macros: ```rust let x = Rooted::new(cx, value); // Was changed to: rooted!(in(cx) let x = value); // Which expands to: let mut __root = Rooted::new_unrooted(value); let x = RootedGuard::new(cx, &mut __root); ``` ```rust let mut v = RootedVec::new(); v.extend(iterator); // Was changed to: rooted_vec!(let v <- iterator); // Which expands to: let mut __root = RootableVec::new(); let v = RootedVec::new(&mut __root, iterator); ``` The `rooted!` macro depends on servo/rust-mozjs#272. These APIs based on two types, a container to be rooted and a rooting guard, allow implementing both `Rooted`-style rooting and `Traceable`-based rooting in stable Rust, without abusing `return_address`. Such macros may have been tried before, but in 1.9 their hygiene is broken, they work only since 1.10. Sadly, `Rooted` is a FFI type and completely exposed, so I cannot prevent anyone from creating their own, although all fields but the value get overwritten by `RootedGuard::new` anyway. `RootableVec` OTOH is *guaranteed* to be empty when not rooted, which makes it harmless AFAICT. By fixing rust-lang/rust#34227, this PR enables Servo to build with `-Zorbit`. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix rust-lang/rust#34227 - [x] These changes do not require tests because they are not functional changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11872) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/timers.rs')
-rw-r--r--components/script/timers.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs
index 237c354be9f..8c2d2d9cac4 100644
--- a/components/script/timers.rs
+++ b/components/script/timers.rs
@@ -13,7 +13,7 @@ use dom::xmlhttprequest::XHRTimeoutCallback;
use euclid::length::Length;
use heapsize::HeapSizeOf;
use ipc_channel::ipc::IpcSender;
-use js::jsapi::{HandleValue, Heap, RootedValue};
+use js::jsapi::{HandleValue, Heap};
use js::jsval::{JSVal, UndefinedValue};
use script_traits::{MsDuration, precise_time_ms};
use script_traits::{TimerEvent, TimerEventId, TimerEventRequest, TimerSource};
@@ -488,7 +488,7 @@ impl JsTimerTask {
match *&self.callback {
InternalTimerCallback::StringTimerCallback(ref code_str) => {
let cx = this.global().r().get_cx();
- let mut rval = RootedValue::new(cx, UndefinedValue());
+ rooted!(in(cx) let mut rval = UndefinedValue());
this.evaluate_js_on_global_with_result(code_str, rval.handle_mut());
},