Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.21.0-nightly (7eeac1b81 2017-08-30)

Browse source
This commit is contained in:
Simon Sapin 2017-08-31 17:17:59 +02:00
parent c4800a6c83
commit 1dcede75d7
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bindings/trace.rs
View file

@ -425,6 +425,13 @@ 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 {
#[inline]
unsafe fn trace(&self, _: *mut JSTracer) {

2
components/script_plugins/utils.rs
View file

@ -29,7 +29,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
}
pub fn in_derive_expn(span: Span) -> bool {
if let Some(i) = span.ctxt.outer().expn_info() {
if let Some(i) = span.ctxt().outer().expn_info() {
if let ExpnFormat::MacroAttribute(n) = i.callee.format {
n.as_str().contains("derive")
} else {

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2017-08-30
nightly-2017-08-31