Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.40.0-nightly (ddf43867a 2019-09-26)

Browse source
This commit is contained in:
Simon Sapin 2019-09-27 13:10:37 +02:00
parent 5fd4467cb3
commit d324a2519f
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script_plugins/unrooted_must_root.rs
View file

@ -52,7 +52,7 @@ fn is_unrooted_ty(
) -> bool { ) -> bool {
let mut ret = false; let mut ret = false;
ty.maybe_walk(|t| { ty.maybe_walk(|t| {
match t.sty { match t.kind {
ty::Adt(did, substs) => { ty::Adt(did, substs) => {
if cx.tcx.has_attr(did.did, sym.must_root) { if cx.tcx.has_attr(did.did, sym.must_root) {
ret = true; ret = true;
@ -62,7 +62,7 @@ fn is_unrooted_ty(
} else if match_def_path(cx, did.did, &[sym.alloc, sym.rc, sym.Rc]) { } else if match_def_path(cx, did.did, &[sym.alloc, sym.rc, sym.Rc]) {
// Rc<Promise> is okay // Rc<Promise> is okay
let inner = substs.type_at(0); 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) { if cx.tcx.has_attr(did.did, sym.allow_unrooted_in_rc) {
false false
} else { } else {

2
components/script_plugins/webidl_must_inherit.rs
View file

@ -94,7 +94,7 @@ fn get_webidl_path(struct_name: &str) -> io::Result<path::PathBuf> {
fn is_webidl_ty(symbols: &crate::Symbols, cx: &LateContext, ty: &ty::TyS) -> bool { fn is_webidl_ty(symbols: &crate::Symbols, cx: &LateContext, ty: &ty::TyS) -> bool {
let mut ret = false; let mut ret = false;
ty.maybe_walk(|t| { ty.maybe_walk(|t| {
match t.sty { match t.kind {
ty::Adt(did, _substs) => { ty::Adt(did, _substs) => {
if cx.tcx.has_attr(did.did, symbols.webidl) { if cx.tcx.has_attr(did.did, symbols.webidl) {
ret = true; ret = true;

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2019-09-24 nightly-2019-09-27