aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/js.rs
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-06-13 14:33:03 -0400
committerbors-servo <release+servo@mozilla.com>2014-06-13 14:33:03 -0400
commit7ed504189198ac2f59c396d5872046ac7c9578b3 (patch)
tree1943813d56e57e8bdb38189351f1b51019c5de68 /src/components/script/dom/bindings/js.rs
parentc0576108c5fb82410faa23dc1cccff2dce56d698 (diff)
parentbda29ade0912f7e17958f2f43dbe068bbb2bfd51 (diff)
downloadservo-7ed504189198ac2f59c396d5872046ac7c9578b3.tar.gz
servo-7ed504189198ac2f59c396d5872046ac7c9578b3.zip
auto merge of #2649 : ebalint/servo/2580_JS_T_unrooted_replace, r=jdm
removed .clone() calls modified from_rooted method parameter: T to &T
Diffstat (limited to 'src/components/script/dom/bindings/js.rs')
-rw-r--r--src/components/script/dom/bindings/js.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/js.rs b/src/components/script/dom/bindings/js.rs
index b72e8c9e42d..81dda57e9ec 100644
--- a/src/components/script/dom/bindings/js.rs
+++ b/src/components/script/dom/bindings/js.rs
@@ -77,7 +77,7 @@ impl<T: Reflectable> Temporary<T> {
/// Create a new Temporary value from a rooted value.
pub fn from_rooted<'a>(root: &JSRef<'a, T>) -> Temporary<T> {
- Temporary::new(root.unrooted())
+ Temporary::new(JS::from_rooted(root))
}
/// Create a stack-bounded root for this value.
@@ -156,7 +156,7 @@ impl<T: Reflectable> JS<T> {
}
impl<T: Assignable<U>, U: Reflectable> JS<U> {
- pub fn from_rooted(root: T) -> JS<U> {
+ pub fn from_rooted(root: &T) -> JS<U> {
unsafe {
root.get_js()
}
@@ -279,7 +279,7 @@ pub trait OptionalUnrootable<T> {
impl<'a, T: Reflectable> OptionalUnrootable<T> for Option<JSRef<'a, T>> {
fn unrooted(&self) -> Option<JS<T>> {
- self.as_ref().map(|inner| inner.unrooted())
+ self.as_ref().map(|inner| JS::from_rooted(inner))
}
}