Skip to content

Commit

Permalink
Unrolled build for rust-lang#115739
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#115739 - Alexendoo:lint-pass-check-attribute, r=oli-obk

Call `LateLintPass::check_attribute` from `with_lint_attrs`

Fixes rust-lang#115571

For regular `register_late_pass` lints also means that `last_node_with_lint_attrs` is correct when in `check_attribute`, I've added a test that previously failed for `clippy::allow_attributes`

As far as I can see the only late lint in rustc that uses `check_attribute` is `unstable_features` which is allow by default and deprecated so this is mostly for clippy (or future rustc lints)
  • Loading branch information
rust-timer authored Sep 11, 2023
2 parents 3ebb562 + ce3b044 commit 3dcb681
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 20 deletions.
25 changes: 12 additions & 13 deletions compiler/rustc_lint/src/late.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use rustc_data_structures::sync::join;
use rustc_hir as hir;
use rustc_hir::def_id::{LocalDefId, LocalModDefId};
use rustc_hir::intravisit as hir_visit;
use rustc_hir::intravisit::Visitor;
use rustc_middle::hir::nested_filter;
use rustc_middle::ty::{self, TyCtxt};
use rustc_session::lint::LintPass;
Expand Down Expand Up @@ -61,6 +60,9 @@ impl<'tcx, T: LateLintPass<'tcx>> LateContextAndPass<'tcx, T> {
self.context.last_node_with_lint_attrs = id;
debug!("late context: enter_attrs({:?})", attrs);
lint_callback!(self, enter_lint_attrs, attrs);
for attr in attrs {
lint_callback!(self, check_attribute, attr);
}
f(self);
debug!("late context: exit_attrs({:?})", attrs);
lint_callback!(self, exit_lint_attrs, attrs);
Expand Down Expand Up @@ -377,20 +379,18 @@ fn late_lint_mod_inner<'tcx, T: LateLintPass<'tcx>>(

let (module, _span, hir_id) = tcx.hir().get_module(module_def_id);

// There is no module lint that will have the crate itself as an item, so check it here.
if hir_id == hir::CRATE_HIR_ID {
lint_callback!(cx, check_crate,);
}
cx.with_lint_attrs(hir_id, |cx| {
// There is no module lint that will have the crate itself as an item, so check it here.
if hir_id == hir::CRATE_HIR_ID {
lint_callback!(cx, check_crate,);
}

cx.process_mod(module, hir_id);
cx.process_mod(module, hir_id);

// Visit the crate attributes
if hir_id == hir::CRATE_HIR_ID {
for attr in tcx.hir().attrs(hir::CRATE_HIR_ID).iter() {
cx.visit_attribute(attr)
if hir_id == hir::CRATE_HIR_ID {
lint_callback!(cx, check_crate_post,);
}
lint_callback!(cx, check_crate_post,);
}
});
}

fn late_lint_crate<'tcx>(tcx: TyCtxt<'tcx>) {
Expand Down Expand Up @@ -431,7 +431,6 @@ fn late_lint_crate_inner<'tcx, T: LateLintPass<'tcx>>(
// item), warn for it here.
lint_callback!(cx, check_crate,);
tcx.hir().walk_toplevel_module(cx);
tcx.hir().walk_attributes(cx);
lint_callback!(cx, check_crate_post,);
})
}
Expand Down
7 changes: 7 additions & 0 deletions src/tools/clippy/tests/ui/allow_attributes.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ struct T4;
#[cfg_attr(panic = "unwind", expect(dead_code))]
struct CfgT;

#[allow(clippy::allow_attributes, unused)]
struct Allowed;

#[expect(clippy::allow_attributes)]
#[allow(unused)]
struct Expected;

fn ignore_external() {
external! {
#[allow(clippy::needless_borrow)] // Should not lint
Expand Down
7 changes: 7 additions & 0 deletions src/tools/clippy/tests/ui/allow_attributes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ struct T4;
#[cfg_attr(panic = "unwind", allow(dead_code))]
struct CfgT;

#[allow(clippy::allow_attributes, unused)]
struct Allowed;

#[expect(clippy::allow_attributes)]
#[allow(unused)]
struct Expected;

fn ignore_external() {
external! {
#[allow(clippy::needless_borrow)] // Should not lint
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
error: `clippy::restriction` is not meant to be enabled as a group
|
= note: because of the command line `--warn clippy::restriction`
= help: enable the restriction lints you need individually
= note: `-D clippy::blanket-clippy-restriction-lints` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::blanket_clippy_restriction_lints)]`

error: `clippy::restriction` is not meant to be enabled as a group
--> $DIR/blanket_clippy_restriction_lints.rs:6:9
|
LL | #![warn(clippy::restriction)]
| ^^^^^^^^^^^^^^^^^^^
|
= help: enable the restriction lints you need individually
= note: `-D clippy::blanket-clippy-restriction-lints` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::blanket_clippy_restriction_lints)]`

error: `clippy::restriction` is not meant to be enabled as a group
--> $DIR/blanket_clippy_restriction_lints.rs:8:9
Expand All @@ -29,5 +24,10 @@ LL | #![forbid(clippy::restriction)]
|
= help: enable the restriction lints you need individually

error: `clippy::restriction` is not meant to be enabled as a group
|
= note: because of the command line `--warn clippy::restriction`
= help: enable the restriction lints you need individually

error: aborting due to 4 previous errors

0 comments on commit 3dcb681

Please sign in to comment.