Merge and extend tests for missing_docs_in_private_items

Author: Jarcho

clippy_lints/src/missing_doc.rs

@@ -1,7 +1,6 @@
 use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint;
 use clippy_utils::{is_doc_hidden, is_from_proc_macro};
-use rustc_ast::tokenstream::TokenTree;
 use rustc_attr_data_structures::AttributeKind;
 use rustc_hir::def_id::LocalDefId;
 use rustc_hir::{
@@ -145,8 +144,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
             | ItemKind::Use(..) => return,
 
             ItemKind::Mod(ident, ..) => {
-                self.module_depth += 1;
                 if item.span.from_expansion() && item.span.eq_ctxt(ident.span) {
+                    self.module_depth += 1;
                     self.require_visibility_at = cx.tcx.opt_local_parent(item.owner_id.def_id);
                     self.macro_module_depth = self.module_depth;
                     return;
@@ -177,6 +176,9 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
                 "missing documentation for item",
             );
         }
+        if matches!(item.kind, ItemKind::Mod(..)) {
+            self.module_depth += 1;
+        }
     }
 
     fn check_item_post(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
@@ -285,13 +287,7 @@ fn is_doc_attr(attr: &Attribute) -> bool {
             if let [ident] = &*attr.path.segments
                 && ident.name == sym::doc =>
         {
-            match &attr.args {
-                AttrArgs::Eq { .. } => true,
-                AttrArgs::Delimited(args) if let Some(TokenTree::Token(t, _)) = args.tokens.get(0) => {
-                    t.is_ident_named(sym::include)
-                },
-                _ => false,
-            }
+            matches!(attr.args, AttrArgs::Eq { .. })
         },
         _ => false,
     }

clippy_utils/src/check_proc_macro.rs

@@ -259,7 +259,14 @@ fn item_search_pat(item: &Item<'_>) -> (Pat, Pat) {
         ItemKind::Trait(IsAuto::Yes, ..) => (Pat::Str("auto"), Pat::Str("}")),
         ItemKind::Trait(..) => (Pat::Str("trait"), Pat::Str("}")),
         ItemKind::Impl(_) => (Pat::Str("impl"), Pat::Str("}")),
-        _ => return (Pat::Str(""), Pat::Str("")),
+        ItemKind::Mod(..) => (Pat::Str("mod"), Pat::Str("}")),
+        ItemKind::Macro(_, def, _) => (
+            Pat::Str(if def.macro_rules { "macro_rules" } else { "macro" }),
+            Pat::Str(""),
+        ),
+        ItemKind::TraitAlias(..) => (Pat::Str("trait"), Pat::Str(";")),
+        ItemKind::GlobalAsm { .. } => return (Pat::Str("global_asm"), Pat::Str("")),
+        ItemKind::Use(..) => return (Pat::Str(""), Pat::Str("")),
     };
     if item.vis_span.is_empty() {
         (start_pat, end_pat)