Refactor

Author: 0urobor0s

compiler/rustc_error_codes/src/error_codes/E0780.md

@@ -1,24 +1,20 @@
-Cannot use `doc(inline)` with wildcard imports
+Cannot use `doc(inline)` with anonymous imports
 
 Erroneous code example:
 
-```compile_fail,E0780
+```compile_fail,E0780,edition2018
 extern crate foo;
 
 #[doc(inline)] // error: invalid doc argument
 pub use foo::Foo as _;
 ```
 
-When using a wildcard import the `doc` attribute currently only supports:
-
- * hidden
-
-To fix this error either change to one of the available arguments or remove the
-`doc` attribute.
+Anonymous imports are always rendered with `#[doc(no_inline)]`. To fix this
+error, remove the `#[doc(inline)]` attribute.
 
 Example:
 
-```
+```ignore (cannot-doctest-multicrate-project)
 extern crate foo;
 
 pub use foo::Foo as _;

src/librustdoc/clean/mod.rs

@@ -2157,17 +2157,17 @@ impl Clean<Vec<Item>> for doctree::Import<'_> {
             return Vec::new();
         }
 
-        let inlined = self.attrs.lists(sym::doc).has_word(sym::inline);
+        let (doc_meta_item, inlined) = self.attrs.lists(sym::doc).get_word_attr(sym::inline);
         let pub_underscore = self.vis.node.is_pub() && self.name == kw::Underscore;
 
         if pub_underscore && inlined {
             rustc_errors::struct_span_err!(
                 cx.tcx.sess,
-                self.attrs.lists(sym::doc).next().unwrap().span(),
+                doc_meta_item.unwrap().span(),
                 E0780,
-                "inline with wildcard import"
+                "anonymous imports cannot be inlined"
             )
-            .span_label(self.span, "wildcard import")
+            .span_label(self.span, "anonymous import")
             .emit();
         }
 
@@ -2189,7 +2189,7 @@ impl Clean<Vec<Item>> for doctree::Import<'_> {
             });
         // Also check whether imports were asked to be inlined, in case we're trying to re-export a
         // crate in Rust 2018+
-        let please_inline = self.attrs.lists(sym::doc).has_word(sym::inline);
+        let please_inline = inlined;
         let path = self.path.clean(cx);
         let inner = if self.glob {
             if !denied {

src/librustdoc/clean/types.rs

@@ -431,12 +431,22 @@ impl AttributesExt for [ast::Attribute] {
 crate trait NestedAttributesExt {
     /// Returns `true` if the attribute list contains a specific `Word`
     fn has_word(self, word: Symbol) -> bool;
+    fn get_word_attr(self, word: Symbol) -> (Option<ast::NestedMetaItem>, bool);
 }
 
-impl<I: IntoIterator<Item = ast::NestedMetaItem>> NestedAttributesExt for I {
+impl<I: Iterator<Item = ast::NestedMetaItem> + IntoIterator<Item = ast::NestedMetaItem>>
+    NestedAttributesExt for I
+{
     fn has_word(self, word: Symbol) -> bool {
         self.into_iter().any(|attr| attr.is_word() && attr.has_name(word))
     }
+
+    fn get_word_attr(mut self, word: Symbol) -> (Option<ast::NestedMetaItem>, bool) {
+        match self.find(|attr| attr.is_word() && attr.has_name(word)) {
+            Some(a) => (Some(a), true),
+            None => (None, false),
+        }
+    }
 }
 
 /// A portion of documentation, extracted from a `#[doc]` attribute.

src/test/rustdoc-ui/issue-61592-2.rs

@@ -0,0 +1,10 @@
+// aux-build:issue-61592.rs
+
+extern crate foo;
+
+#[doc = "bar"]
+#[doc(inline)] //~ ERROR
+#[doc = "baz"]
+pub use foo::Foo as _;
+
+fn main() {}

src/test/rustdoc-ui/issue-61592-2.stderr

@@ -0,0 +1,12 @@
+error[E0780]: anonymous imports cannot be inlined
+  --> $DIR/issue-61592-2.rs:6:7
+   |
+LL | #[doc(inline)]
+   |       ^^^^^^
+LL | #[doc = "baz"]
+LL | pub use foo::Foo as _;
+   | ---------------------- anonymous import
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0780`.