diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/document.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/htmlheadelement.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 2 | ||||
| -rw-r--r-- | components/script/lib.rs | 3 | ||||
| -rw-r--r-- | components/script/script_task.rs | 1 |
5 files changed, 6 insertions, 7 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index c11c22b67b6..bde9652cf1f 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1461,7 +1461,7 @@ impl DocumentProgressHandler { subpage_id, "mozbrowserloadend".to_owned(), None); - chan.send(event); + chan.send(event).unwrap(); } } diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs index 7f2a03c96d2..cf1cca4decf 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/components/script/dom/htmlheadelement.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods; use dom::bindings::codegen::Bindings::HTMLHeadElementBinding; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; @@ -51,7 +50,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLHeadElement> { let htmlelement: &JSRef<HTMLElement> = HTMLElementCast::from_borrowed_ref(self); Some(htmlelement as &VirtualMethods) } - fn bind_to_tree(&self, tree_in_doc: bool) { + fn bind_to_tree(&self, _tree_in_doc: bool) { if !opts::get().userscripts { return; } @@ -79,7 +78,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLHeadElement> { let new_script = new_script.r(); new_script.set_string_attribute(&atom!("src"), name); let new_script_node: &JSRef<Node> = NodeCast::from_borrowed_ref(&new_script); - node.InsertBefore(*new_script_node, first_child.r()); + node.InsertBefore(*new_script_node, first_child.r()).unwrap(); } } } diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index b35fb8695f8..ec532c7b695 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -19,7 +19,7 @@ use dom::customevent::CustomEvent; use dom::document::Document; use dom::element::Element; use dom::element::AttributeHandlers; -use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers}; +use dom::event::{Event, EventHelpers}; use dom::eventtarget::{EventTarget, EventTargetTypeId}; use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; diff --git a/components/script/lib.rs b/components/script/lib.rs index b4603a931b0..5895127b552 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -6,14 +6,15 @@ #![feature(box_syntax)] #![feature(collections)] #![feature(core)] +#![feature(custom_attribute)] #![feature(int_uint)] #![feature(old_io)] +#![feature(path)] #![feature(plugin)] #![feature(rustc_private)] #![feature(std_misc)] #![feature(unicode)] #![feature(unsafe_destructor)] -#![feature(custom_attribute)] #![deny(unsafe_code)] #![allow(non_snake_case)] diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 847da174eff..b66de84bc5c 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -24,7 +24,6 @@ use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, Documen use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetCast, HTMLIFrameElementCast, NodeCast, EventCast}; use dom::bindings::conversions::FromJSValConvertible; use dom::bindings::conversions::StringificationBehavior; -use dom::bindings::global::GlobalRef; use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable, RootedReference}; use dom::bindings::js::{RootCollection, RootCollectionPtr}; use dom::bindings::refcounted::{LiveDOMReferences, Trusted, TrustedReference}; |