Skip to content

Commit

Permalink
fix [empty_docs] trigger in proc-macro
Browse files Browse the repository at this point in the history
  • Loading branch information
J-ZhengLi committed Mar 12, 2024
1 parent 10677d6 commit 3cd6fd1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 21 deletions.
13 changes: 11 additions & 2 deletions clippy_lints/src/doc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use rustc_data_structures::fx::FxHashSet;
use rustc_hir as hir;
use rustc_hir::intravisit::{self, Visitor};
use rustc_hir::{AnonConst, Expr};
use rustc_lint::{LateContext, LateLintPass};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::hir::nested_filter;
use rustc_middle::lint::in_external_macro;
use rustc_middle::ty;
Expand Down Expand Up @@ -538,7 +538,16 @@ fn check_attrs(cx: &LateContext<'_>, valid_idents: &FxHashSet<String>, attrs: &[

suspicious_doc_comments::check(cx, attrs);

let (fragments, _) = attrs_to_doc_fragments(attrs.iter().map(|attr| (attr, None)), true);
let (fragments, _) = attrs_to_doc_fragments(
attrs.iter().filter_map(|attr| {
if in_external_macro(cx.sess(), attr.span) {
None
} else {
Some((attr, None))
}
}),
true,
);
let mut doc = fragments.iter().fold(String::new(), |mut acc, fragment| {
add_doc_fragment(&mut acc, fragment);
acc
Expand Down
20 changes: 1 addition & 19 deletions tests/ui/empty_docs.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,5 @@ LL | ///
|
= help: consider removing or filling it

error: empty doc comment
--> tests/ui/empty_docs.rs:77:5
|
LL | #[with_empty_docs]
| ^^^^^^^^^^^^^^^^^^
|
= help: consider removing or filling it
= note: this error originates in the attribute macro `with_empty_docs` (in Nightly builds, run with -Z macro-backtrace for more info)

error: empty doc comment
--> tests/ui/empty_docs.rs:82:5
|
LL | #[with_empty_docs]
| ^^^^^^^^^^^^^^^^^^
|
= help: consider removing or filling it
= note: this error originates in the attribute macro `with_empty_docs` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to 11 previous errors
error: aborting due to 9 previous errors

0 comments on commit 3cd6fd1

Please sign in to comment.