Skip to content

Commit 12ce80a

Browse files
committed
Fix ui-fulldeps tests.
1 parent 27ef0ee commit 12ce80a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingAllowedAttrPass {
4949
};
5050

5151
let allowed = |attr| pprust::attribute_to_string(attr).contains("allowed_attr");
52-
if !item.attrs.iter().any(allowed) {
52+
if !cx.tcx.hir().attrs(item.hir_id).iter().any(allowed) {
5353
cx.lint(MISSING_ALLOWED_ATTR, |lint| {
5454
lint.build("Missing 'allowed_attr' attribute").set_span(span).emit()
5555
});

src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ macro_rules! fake_lint_pass {
2828

2929
impl LateLintPass<'_> for $struct {
3030
fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) {
31+
let attrs = cx.tcx.hir().attrs(rustc_hir::CRATE_HIR_ID);
3132
$(
32-
if !cx.sess().contains_name(&krate.item.attrs, $attr) {
33+
if !cx.sess().contains_name(attrs, $attr) {
3334
cx.lint(CRATE_NOT_OKAY, |lint| {
3435
let msg = format!("crate is not marked with #![{}]", $attr);
3536
lint.build(&msg).set_span(krate.item.span).emit()

src/test/ui-fulldeps/auxiliary/lint-for-crate.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ declare_lint_pass!(Pass => [CRATE_NOT_OKAY]);
2727

2828
impl<'tcx> LateLintPass<'tcx> for Pass {
2929
fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) {
30-
if !cx.sess().contains_name(&krate.item.attrs, Symbol::intern("crate_okay")) {
30+
let attrs = cx.tcx.hir().attrs(rustc_hir::CRATE_HIR_ID);
31+
if !cx.sess().contains_name(attrs, Symbol::intern("crate_okay")) {
3132
cx.lint(CRATE_NOT_OKAY, |lint| {
3233
lint.build("crate is not marked with #![crate_okay]")
3334
.set_span(krate.item.span)

0 commit comments

Comments
 (0)