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

Merge pull request #3493 from zwarich/root-lifetimes

Browse source 
Improve the correctness of Root lifetimes

Reviewed-by: jdm
This commit is contained in:
bors-servo 2014-09-26 19:57:33 -06:00
commit 86eec63a02
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/bindings/js.rs
View file

@ -375,7 +375,7 @@ impl RootCollection {
/// Create a new stack-bounded root that will not outlive this collection /// Create a new stack-bounded root that will not outlive this collection
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
fn new_root<'a, 'b, T: Reflectable>(&'a self, unrooted: &JS<T>) -> Root<'a, 'b, T> { fn new_root<'b, 'a: 'b, T: Reflectable>(&'a self, unrooted: &JS<T>) -> Root<'a, 'b, T> {
Root::new(self, unrooted) Root::new(self, unrooted)
} }
@ -409,7 +409,7 @@ pub struct Root<'a, 'b, T> {
js_ptr: *mut JSObject, js_ptr: *mut JSObject,
} }
impl<'a, 'b, T: Reflectable> Root<'a, 'b, T> { impl<'b, 'a: 'b, T: Reflectable> Root<'a, 'b, T> {
/// Create a new stack-bounded root for the provided JS-owned value. /// Create a new stack-bounded root for the provided JS-owned value.
/// It cannot not outlive its associated `RootCollection`, and it contains a `JSRef` /// It cannot not outlive its associated `RootCollection`, and it contains a `JSRef`
/// which cannot outlive this new `Root`. /// which cannot outlive this new `Root`.
@ -434,13 +434,13 @@ impl<'a, 'b, T: Reflectable> Root<'a, 'b, T> {
} }
#[unsafe_destructor] #[unsafe_destructor]
impl<'a, 'b, T: Reflectable> Drop for Root<'a, 'b, T> { impl<'b, 'a: 'b, T: Reflectable> Drop for Root<'a, 'b, T> {
fn drop(&mut self) { fn drop(&mut self) {
self.root_list.unroot(self); self.root_list.unroot(self);
} }
} }
impl<'a, 'b, T: Reflectable> Deref<JSRef<'b, T>> for Root<'a, 'b, T> { impl<'b, 'a: 'b, T: Reflectable> Deref<JSRef<'b, T>> for Root<'a, 'b, T> {
fn deref<'c>(&'c self) -> &'c JSRef<'b, T> { fn deref<'c>(&'c self) -> &'c JSRef<'b, T> {
&self.jsref &self.jsref
} }