aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/js.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-03-11 11:08:57 +0100
committerJosh Matthews <josh@joshmatthews.net>2015-03-18 13:18:31 -0400
commit5f15eb5fbfb7a8649132cc8b3a07314389836714 (patch)
treecc36210329cb1a31709a03685c05c4aaa99407e3 /components/script/dom/bindings/js.rs
parent65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff)
downloadservo-5f15eb5fbfb7a8649132cc8b3a07314389836714.tar.gz
servo-5f15eb5fbfb7a8649132cc8b3a07314389836714.zip
Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-dev.
Diffstat (limited to 'components/script/dom/bindings/js.rs')
-rw-r--r--components/script/dom/bindings/js.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index 7ada9f45d14..72f4c16e832 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -62,7 +62,7 @@ use util::smallvec::{SmallVec, SmallVec16};
use core::nonzero::NonZero;
use std::cell::{Cell, UnsafeCell};
use std::default::Default;
-use std::marker::ContravariantLifetime;
+use std::marker::PhantomData;
use std::mem;
use std::ops::Deref;
@@ -677,7 +677,7 @@ impl<T: Reflectable> Root<T> {
pub fn r<'b>(&'b self) -> JSRef<'b, T> {
JSRef {
ptr: self.ptr,
- chain: ContravariantLifetime,
+ chain: PhantomData,
}
}
@@ -688,7 +688,7 @@ impl<T: Reflectable> Root<T> {
pub fn get_unsound_ref_forever<'b>(&self) -> JSRef<'b, T> {
JSRef {
ptr: self.ptr,
- chain: ContravariantLifetime,
+ chain: PhantomData,
}
}
}
@@ -713,7 +713,7 @@ impl<'a, T: Reflectable> Deref for JSRef<'a, T> {
/// copyable.
pub struct JSRef<'a, T> {
ptr: NonZero<*const T>,
- chain: ContravariantLifetime<'a>,
+ chain: PhantomData<&'a ()>,
}
impl<'a, T> Copy for JSRef<'a, T> {}