diff options
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 7 | ||||
| -rw-r--r-- | components/script/dom/stylesheet.rs | 19 | ||||
| -rw-r--r-- | components/script/dom/treewalker.rs | 3 | ||||
| -rw-r--r-- | components/script/dom/worker.rs | 4 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
5 files changed, 2 insertions, 33 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index ee8e93e03ac..9a38807e510 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -503,13 +503,6 @@ unsafe impl<A, B> JSTraceable for fn(A) -> B { } } -unsafe impl<'a, A, B> JSTraceable for fn(&A) -> B { - #[inline] - unsafe fn trace(&self, _: *mut JSTracer) { - // Do nothing - } -} - unsafe impl<T> JSTraceable for IpcSender<T> where T: for<'de> Deserialize<'de> + Serialize, diff --git a/components/script/dom/stylesheet.rs b/components/script/dom/stylesheet.rs index 93b3c745594..7d11ccdb897 100644 --- a/components/script/dom/stylesheet.rs +++ b/components/script/dom/stylesheet.rs @@ -2,14 +2,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use crate::dom::bindings::codegen::Bindings::StyleSheetBinding; use crate::dom::bindings::codegen::Bindings::StyleSheetBinding::StyleSheetMethods; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; -use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::reflector::Reflector; use crate::dom::bindings::str::DOMString; use crate::dom::cssstylesheet::CSSStyleSheet; -use crate::dom::window::Window; use dom_struct::dom_struct; #[dom_struct] @@ -34,20 +31,6 @@ impl StyleSheet { title: title, } } - - #[allow(unrooted_must_root)] - pub fn new( - window: &Window, - type_: DOMString, - href: Option<DOMString>, - title: Option<DOMString>, - ) -> DomRoot<StyleSheet> { - reflect_dom_object( - Box::new(StyleSheet::new_inherited(type_, href, title)), - window, - StyleSheetBinding::Wrap, - ) - } } impl StyleSheetMethods for StyleSheet { diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index af5437b2516..6b11c410bf8 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -84,7 +84,6 @@ impl TreeWalkerMethods for TreeWalker { match self.filter { Filter::None => None, Filter::Dom(ref nf) => Some(nf.clone()), - Filter::Native(_) => panic!("Cannot convert native node filter to DOM NodeFilter"), } } @@ -434,7 +433,6 @@ impl TreeWalker { match self.filter { // Step 4. Filter::None => Ok(NodeFilterConstants::FILTER_ACCEPT), - Filter::Native(f) => Ok((f)(node)), Filter::Dom(ref callback) => { // Step 5. self.active.set(true); @@ -479,6 +477,5 @@ impl<'a> Iterator for &'a TreeWalker { #[derive(JSTraceable)] pub enum Filter { None, - Native(fn(node: &Node) -> u16), Dom(Rc<NodeFilter>), } diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index d4edd339463..7135e969c0e 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -124,10 +124,6 @@ impl Worker { Ok(worker) } - pub fn is_closing(&self) -> bool { - self.closing.load(Ordering::SeqCst) - } - pub fn is_terminated(&self) -> bool { self.terminated.get() } diff --git a/rust-toolchain b/rust-toolchain index 6f098ceaa7a..b3ce0a23f6e 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2018-12-28 +nightly-2019-01-04 |