aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_plugins
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2019-09-28 12:33:33 +0200
committerSimon Sapin <simon.sapin@exyr.org>2019-09-28 12:33:33 +0200
commit5b935a60a5d76d5a5872ce256918f10fdcd50915 (patch)
tree185e2286aed1455ef523e7626c5d535cc911088c /components/script_plugins
parentb0b01b86b8e848bf29f557855a58fc1e0d2dff6e (diff)
downloadservo-5b935a60a5d76d5a5872ce256918f10fdcd50915.tar.gz
servo-5b935a60a5d76d5a5872ce256918f10fdcd50915.zip
Upgrade to rustc 1.40.0-nightly (084beb83e 2019-09-27)
Diffstat (limited to 'components/script_plugins')
-rw-r--r--components/script_plugins/unrooted_must_root.rs6
-rw-r--r--components/script_plugins/webidl_must_inherit.rs2
2 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 cfd8169934e..c0587d8497a 100644
--- a/components/script_plugins/unrooted_must_root.rs
+++ b/components/script_plugins/unrooted_must_root.rs
@@ -151,7 +151,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
{
return;
}
- if let hir::ItemKind::Struct(def, ..) = &item.node {
+ if let hir::ItemKind::Struct(def, ..) = &item.kind {
for ref field in def.fields() {
let def_id = cx.tcx.hir().local_def_id(field.hir_id);
if is_unrooted_ty(&self.symbols, cx, cx.tcx.type_of(def_id), false) {
@@ -257,7 +257,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
}
};
- match expr.node {
+ match expr.kind {
// Trait casts from #[must_root] types are not allowed
ExprKind::Cast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr),
// This catches assignments... the main point of this would be to catch mutable
@@ -286,7 +286,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
// When "default binding modes" https://github.com/rust-lang/rust/issues/42640
// are implemented, the `Unannotated` case could cause false-positives.
// These should be fixable by adding an explicit `ref`.
- match pat.node {
+ match pat.kind {
hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, ..) |
hir::PatKind::Binding(hir::BindingAnnotation::Mutable, ..) => {
let ty = cx.tables.pat_ty(pat);
diff --git a/components/script_plugins/webidl_must_inherit.rs b/components/script_plugins/webidl_must_inherit.rs
index 063d99db2af..95d8ad386a9 100644
--- a/components/script_plugins/webidl_must_inherit.rs
+++ b/components/script_plugins/webidl_must_inherit.rs
@@ -177,7 +177,7 @@ impl LintPass for WebIdlPass {
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass {
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item) {
- let def = match &item.node {
+ let def = match &item.kind {
hir::ItemKind::Struct(def, ..) => def,
_ => return,
};