Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-27 17:20:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update nightly Rust.

Browse source
This commit is contained in:
Josh Matthews 2022-03-26 21:36:59 -04:00
parent 4272a4d6f1
commit 0179edb707
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script_plugins/lib.rs
View file

@ -111,16 +111,16 @@ fn is_unrooted_ty<'tcx>(
let recur_into_subtree = match t.kind() { let recur_into_subtree = match t.kind() {
ty::Adt(did, substs) => { ty::Adt(did, substs) => {
let has_attr = |did, name| has_lint_attr(sym, &cx.tcx.get_attrs(did), name); let has_attr = |did, name| has_lint_attr(sym, &cx.tcx.get_attrs(did), name);
if has_attr(did.did, sym.must_root) { if has_attr(did.did(), sym.must_root) {
ret = true; ret = true;
false false
} else if has_attr(did.did, sym.allow_unrooted_interior) { } else if has_attr(did.did(), sym.allow_unrooted_interior) {
false false
} 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.kind() { if let ty::Adt(did, _) = inner.kind() {
if has_attr(did.did, sym.allow_unrooted_in_rc) { if has_attr(did.did(), sym.allow_unrooted_in_rc) {
false false
} else { } else {
true true
@ -128,24 +128,24 @@ fn is_unrooted_ty<'tcx>(
} else { } else {
true true
} }
} else if match_def_path(cx, did.did, &[sym::core, sym.cell, sym.Ref]) || } else if match_def_path(cx, did.did(), &[sym::core, sym.cell, sym.Ref]) ||
match_def_path(cx, did.did, &[sym::core, sym.cell, sym.RefMut]) || match_def_path(cx, did.did(), &[sym::core, sym.cell, sym.RefMut]) ||
match_def_path(cx, did.did, &[sym::core, sym::slice, sym::iter, sym.Iter]) || match_def_path(cx, did.did(), &[sym::core, sym::slice, sym::iter, sym.Iter]) ||
match_def_path( match_def_path(
cx, cx,
did.did, did.did(),
&[sym::core, sym::slice, sym::iter, sym.IterMut], &[sym::core, sym::slice, sym::iter, sym.IterMut],
) || ) ||
match_def_path(cx, did.did, &[sym.accountable_refcell, sym.Ref]) || match_def_path(cx, did.did(), &[sym.accountable_refcell, sym.Ref]) ||
match_def_path(cx, did.did, &[sym.accountable_refcell, sym.RefMut]) || match_def_path(cx, did.did(), &[sym.accountable_refcell, sym.RefMut]) ||
match_def_path( match_def_path(
cx, cx,
did.did, did.did(),
&[sym::std, sym.collections, sym.hash, sym.map, sym.Entry], &[sym::std, sym.collections, sym.hash, sym.map, sym.Entry],
) || ) ||
match_def_path( match_def_path(
cx, cx,
did.did, did.did(),
&[ &[
sym::std, sym::std,
sym.collections, sym.collections,
@ -156,7 +156,7 @@ fn is_unrooted_ty<'tcx>(
) || ) ||
match_def_path( match_def_path(
cx, cx,
did.did, did.did(),
&[ &[
sym::std, sym::std,
sym.collections, sym.collections,
@ -167,12 +167,12 @@ fn is_unrooted_ty<'tcx>(
) || ) ||
match_def_path( match_def_path(
cx, cx,
did.did, did.did(),
&[sym::std, sym.collections, sym.hash, sym.map, sym.Iter], &[sym::std, sym.collections, sym.hash, sym.map, sym.Iter],
) || ) ||
match_def_path( match_def_path(
cx, cx,
did.did, did.did(),
&[sym::std, sym.collections, sym.hash, sym.set, sym.Iter], &[sym::std, sym.collections, sym.hash, sym.set, sym.Iter],
) )
{ {

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2022-03-06 nightly-2022-03-26