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

SimonSapin · SimonSapin · commit 1dcede75d727 · 2017-08-31T17:17:59.000+02:00
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
@@ -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) {
diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs
@@ -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 {
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2017-08-30
+nightly-2017-08-31

Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,13 @@ unsafe impl<A, B> JSTraceable for fn(A) -> B {`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`
	`428`	`+unsafe impl<'a, A, B> JSTraceable for fn(&A) -> B {`
	`429`	`+ #[inline]`
	`430`	`+ unsafe fn trace(&self, _: *mut JSTracer) {`
	`431`	`+ // Do nothing`
	`432`	`+ }`
	`433`	`+}`
	`434`	`+`
`428`	`435`	`unsafe impl<T> JSTraceable for IpcSender<T> where T: for<'de> Deserialize<'de> + Serialize {`
`429`	`436`	`#[inline]`
`430`	`437`	`unsafe fn trace(&self, _: *mut JSTracer) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`pub fn in_derive_expn(span: Span) -> bool {`
`32`		`- if let Some(i) = span.ctxt.outer().expn_info() {`
	`32`	`+ if let Some(i) = span.ctxt().outer().expn_info() {`
`33`	`33`	`if let ExpnFormat::MacroAttribute(n) = i.callee.format {`
`34`	`34`	`n.as_str().contains("derive")`
`35`	`35`	`} else {`