From 12ce80a9ea9f15b38e37017ee5a944c45681fbe9 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Sat, 5 Dec 2020 21:23:37 +0100
Subject: [PATCH] Fix ui-fulldeps tests.

---
 src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs   | 2 +-
 src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs | 3 ++-
 src/test/ui-fulldeps/auxiliary/lint-for-crate.rs       | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
index 4e9d4d34273..ad87d3611f7 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
@@ -49,7 +49,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingAllowedAttrPass {
         };
 
         let allowed = |attr| pprust::attribute_to_string(attr).contains("allowed_attr");
-        if !item.attrs.iter().any(allowed) {
+        if !cx.tcx.hir().attrs(item.hir_id).iter().any(allowed) {
             cx.lint(MISSING_ALLOWED_ATTR, |lint| {
                 lint.build("Missing 'allowed_attr' attribute").set_span(span).emit()
             });
diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
index 736a8633dac..8b1a3887f15 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
@@ -28,8 +28,9 @@ macro_rules! fake_lint_pass {
 
         impl LateLintPass<'_> for $struct {
             fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) {
+                let attrs = cx.tcx.hir().attrs(rustc_hir::CRATE_HIR_ID);
                 $(
-                    if !cx.sess().contains_name(&krate.item.attrs, $attr) {
+                    if !cx.sess().contains_name(attrs, $attr) {
                         cx.lint(CRATE_NOT_OKAY, |lint| {
                              let msg = format!("crate is not marked with #![{}]", $attr);
                              lint.build(&msg).set_span(krate.item.span).emit()
diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
index bd477b793fc..c9269d2b9ba 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
@@ -27,7 +27,8 @@ declare_lint_pass!(Pass => [CRATE_NOT_OKAY]);
 
 impl<'tcx> LateLintPass<'tcx> for Pass {
     fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) {
-        if !cx.sess().contains_name(&krate.item.attrs, Symbol::intern("crate_okay")) {
+        let attrs = cx.tcx.hir().attrs(rustc_hir::CRATE_HIR_ID);
+        if !cx.sess().contains_name(attrs, Symbol::intern("crate_okay")) {
             cx.lint(CRATE_NOT_OKAY, |lint| {
                 lint.build("crate is not marked with #![crate_okay]")
                     .set_span(krate.item.span)