diff --git a/src/components/script/dom/bindings/js.rs b/src/components/script/dom/bindings/js.rs index e273dfc7bad..b83115e289d 100644 --- a/src/components/script/dom/bindings/js.rs +++ b/src/components/script/dom/bindings/js.rs @@ -60,7 +60,7 @@ use std::mem; pub struct Temporary { inner: JS, /// On-stack JS pointer to assuage conservative stack scanner - js_ptr: *mut JSObject, + _js_ptr: *mut JSObject, } impl PartialEq for Temporary { @@ -74,7 +74,7 @@ impl Temporary { pub fn new(inner: JS) -> Temporary { Temporary { inner: inner, - js_ptr: inner.reflector().get_jsobject(), + _js_ptr: inner.reflector().get_jsobject(), } } @@ -388,8 +388,6 @@ pub struct Root<'a, 'b, T> { root_list: &'a RootCollection, /// Reference to rooted value that must not outlive this container jsref: JSRef<'b, T>, - /// Pointer to underlying Rust data - ptr: *T, /// On-stack JS pointer to assuage conservative stack scanner js_ptr: *mut JSObject, } @@ -405,7 +403,6 @@ impl<'a, 'b, T: Reflectable> Root<'a, 'b, T> { ptr: unrooted.ptr.clone(), chain: ContravariantLifetime, }, - ptr: unrooted.ptr.clone(), js_ptr: unrooted.reflector().get_jsobject(), }; roots.root(&root); diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index 9ae21154cfb..8e2d94081f8 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -98,7 +98,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> { let mut data = self.data.deref().borrow().as_slice().slice(0, offset as uint).to_string(); data.push_str(arg.as_slice()); data.push_str(self.data.deref().borrow().as_slice().slice((offset + count) as uint, length as uint)); - *self.data.deref().borrow_mut() = data.into_owned(); + *self.data.deref().borrow_mut() = data; // FIXME: Once we have `Range`, we should implement step7 to step11 Ok(()) } diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index 64bf42ecfe5..2f92c858398 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -103,7 +103,7 @@ impl HTMLCollection { } } let filter = ClassNameFilter { - classes: split_html_space_chars(classes.as_slice()).map(|class| class.into_owned()).collect() + classes: split_html_space_chars(classes.as_slice()).map(|class| class.to_string()).collect() }; HTMLCollection::create(window, root, box filter) } diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index 88866d6e1e7..3f2b753c55b 100644 --- a/src/components/script/dom/htmlserializer.rs +++ b/src/components/script/dom/htmlserializer.rs @@ -62,7 +62,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> String { html.push_str(open_elements.pop().unwrap().as_slice()); html.push_str(">"); } - html.into_owned() + html } fn serialize_comment(comment: &JSRef, html: &mut String) { diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index def4ee6248d..9892f0b5f27 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -157,8 +157,8 @@ pub struct SharedLayoutData { /// Encapsulates the abstract layout data. pub struct LayoutData { chan: Option, - shared_data: SharedLayoutData, - data: *(), + _shared_data: SharedLayoutData, + _data: *(), } pub struct LayoutDataRef { @@ -1539,7 +1539,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { content.push_str(text.deref().characterdata.data.deref().borrow().as_slice()); } } - Some(content.into_owned()) + Some(content) } CommentNodeTypeId | TextNodeTypeId |