mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #22612 - servo:rustup, r=jdm
Upgrade to rustc 1.33.0-nightly (c0bbc3927 2019-01-03) This deals with a breaking change in the language that affect stable code, in the exact opposite way from a previous breaking change from August 2017. See https://github.com/rust-lang/rust/issues/56105#issuecomment-451457706 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22612) <!-- Reviewable:end -->
This commit is contained in:
commit
7a64588efa
5 changed files with 2 additions and 33 deletions
|
@ -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,
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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>),
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
nightly-2018-12-28
|
||||
nightly-2019-01-04
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue