diff options
Diffstat (limited to 'components/plugins/lints/unrooted_must_root.rs')
| -rw-r--r-- | components/plugins/lints/unrooted_must_root.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs index 5b6e16c99e9..7f4eacdbd62 100644 --- a/components/plugins/lints/unrooted_must_root.rs +++ b/components/plugins/lints/unrooted_must_root.rs @@ -80,7 +80,7 @@ impl LateLintPass for UnrootedPass { /// All structs containing #[must_root] types must be #[must_root] themselves fn check_struct_def(&mut self, cx: &LateContext, - def: &hir::StructDef, + def: &hir::VariantData, _n: ast::Name, _gen: &hir::Generics, id: ast::NodeId) { @@ -89,7 +89,7 @@ impl LateLintPass for UnrootedPass { _ => cx.tcx.map.expect_item(cx.tcx.map.get_parent(id)), }; if item.attrs.iter().all(|a| !a.check_name("must_root")) { - for ref field in &def.fields { + for ref field in def.fields() { if is_unrooted_ty(cx, cx.tcx.node_id_to_type(field.node.id), false) { cx.span_lint(UNROOTED_MUST_ROOT, field.span, "Type must be rooted, use #[must_root] on the struct definition to propagate") @@ -101,13 +101,13 @@ impl LateLintPass for UnrootedPass { /// All enums containing #[must_root] types must be #[must_root] themselves fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) { let ref map = cx.tcx.map; - if map.expect_item(map.get_parent(var.node.id)).attrs.iter().all(|a| !a.check_name("must_root")) { - match var.node.kind { - hir::TupleVariantKind(ref vec) => { + if map.expect_item(map.get_parent(var.node.data.id())).attrs.iter().all(|a| !a.check_name("must_root")) { + match var.node.data { + hir::VariantData::Tuple(ref vec, _) => { for ty in vec { - cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.id).map(|t| { + cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.node.id).map(|t| { if is_unrooted_ty(cx, t, false) { - cx.span_lint(UNROOTED_MUST_ROOT, ty.ty.span, + cx.span_lint(UNROOTED_MUST_ROOT, ty.node.ty.span, "Type must be rooted, use #[must_root] on \ the enum definition to propagate") } |