From d324a2519f7a6146318fcdddb8f8be379c1c6c4a Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 27 Sep 2019 13:10:37 +0200 Subject: [PATCH] Upgrade to rustc 1.40.0-nightly (ddf43867a 2019-09-26) --- components/script_plugins/unrooted_must_root.rs | 4 ++-- components/script_plugins/webidl_must_inherit.rs | 2 +- rust-toolchain | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index bc99aa36d70c..cfd8169934e1 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -52,7 +52,7 @@ fn is_unrooted_ty( ) -> bool { let mut ret = false; ty.maybe_walk(|t| { - match t.sty { + match t.kind { ty::Adt(did, substs) => { if cx.tcx.has_attr(did.did, sym.must_root) { ret = true; @@ -62,7 +62,7 @@ fn is_unrooted_ty( } else if match_def_path(cx, did.did, &[sym.alloc, sym.rc, sym.Rc]) { // Rc is okay let inner = substs.type_at(0); - if let ty::Adt(did, _) = inner.sty { + if let ty::Adt(did, _) = inner.kind { if cx.tcx.has_attr(did.did, sym.allow_unrooted_in_rc) { false } else { diff --git a/components/script_plugins/webidl_must_inherit.rs b/components/script_plugins/webidl_must_inherit.rs index 83f00197c3e3..063d99db2af8 100644 --- a/components/script_plugins/webidl_must_inherit.rs +++ b/components/script_plugins/webidl_must_inherit.rs @@ -94,7 +94,7 @@ fn get_webidl_path(struct_name: &str) -> io::Result { fn is_webidl_ty(symbols: &crate::Symbols, cx: &LateContext, ty: &ty::TyS) -> bool { let mut ret = false; ty.maybe_walk(|t| { - match t.sty { + match t.kind { ty::Adt(did, _substs) => { if cx.tcx.has_attr(did.did, symbols.webidl) { ret = true; diff --git a/rust-toolchain b/rust-toolchain index 756a627ce32d..40b671b8acac 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2019-09-24 +nightly-2019-09-27