aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_plugins/lib.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2022-01-20 23:05:47 -0500
committerJosh Matthews <josh@joshmatthews.net>2022-01-20 23:05:47 -0500
commit18dbcda8f5b541a68862be8e1febef1e5f88f72d (patch)
treef6cbef4306aa29417f611e962cc1b9fa0cd9fe21 /components/script_plugins/lib.rs
parent4401622eb11a4719c17446bec19d3a80fa585d28 (diff)
downloadservo-18dbcda8f5b541a68862be8e1febef1e5f88f72d.tar.gz
servo-18dbcda8f5b541a68862be8e1febef1e5f88f72d.zip
Update rustc.
Diffstat (limited to 'components/script_plugins/lib.rs')
-rw-r--r--components/script_plugins/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
index 11d3b70609d..b544b95ca1a 100644
--- a/components/script_plugins/lib.rs
+++ b/components/script_plugins/lib.rs
@@ -99,7 +99,7 @@ fn is_unrooted_ty<'tcx>(
in_new_function: bool,
) -> bool {
let mut ret = false;
- let mut walker = ty.walk(cx.tcx);
+ let mut walker = ty.walk();
while let Some(generic_arg) = walker.next() {
let t = match generic_arg.unpack() {
rustc_middle::ty::subst::GenericArgKind::Type(t) => t,
@@ -233,7 +233,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
/// must be #[unrooted_must_root_lint::must_root] themselves
fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant) {
let ref map = cx.tcx.hir();
- let parent_item = map.expect_item(map.get_parent_item(var.id).expect_owner());
+ let parent_item = map.expect_item(map.get_parent_item(var.id));
let attrs = cx.tcx.hir().attrs(parent_item.hir_id());
if !has_lint_attr(&self.symbols, &attrs, self.symbols.must_root) {
match var.data {
@@ -378,8 +378,8 @@ impl<'a, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'tcx> {
fn visit_ty(&mut self, _: &'tcx hir::Ty) {}
- fn nested_visit_map(&mut self) -> hir::intravisit::NestedVisitorMap<Self::Map> {
- hir::intravisit::NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
+ fn nested_visit_map(&mut self) -> Self::Map {
+ self.cx.tcx.hir()
}
}