rust-lang · bors · Jun 27, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 25, 2023
diff --git a/compiler/rustc_mir_build/src/build/custom/mod.rs b/compiler/rustc_mir_build/src/build/custom/mod.rs
@@ -118,7 +118,11 @@ fn parse_attribute(attr: &Attribute) -> MirPhase {
                 phase = Some(value);
             }
             other => {
-                panic!("Unexpected key {}", other);
+                span_bug!(
+                    nested.span(),
+                    "Unexpected key while parsing custom_mir attribute: '{}'",
+                    other
+                );
             }
         }
     }

diff --git a/src/doc/book b/src/doc/book
diff --git a/src/doc/nomicon b/src/doc/nomicon
diff --git a/src/doc/reference b/src/doc/reference
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -2371,7 +2371,7 @@ fn filter_tokens_from_list(
     tokens
 }
 
-/// When inlining items, we merge its attributes (and all the reexports attributes too) with the
+/// When inlining items, we merge their attributes (and all the reexports attributes too) with the
 /// final reexport. For example:
 ///
 /// ```ignore (just an example)

diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
@@ -956,6 +956,8 @@ pub(crate) trait AttributesExt {
                     .filter_map(|attr| Cfg::parse(attr.meta_item()?).ok())
                     .fold(Cfg::True, |cfg, new_cfg| cfg & new_cfg)
             } else if doc_auto_cfg_active {
+                // If there is no `doc(cfg())`, then we retrieve the `cfg()` attributes (because
+                // `doc(cfg())` overrides `cfg()`).
                 self.iter()
                     .filter(|attr| attr.has_name(sym::cfg))
                     .filter_map(|attr| single(attr.meta_item_list()?))
@@ -2387,6 +2389,7 @@ impl ImplKind {
 #[derive(Clone, Debug)]
 pub(crate) struct Import {
     pub(crate) kind: ImportKind,
+    /// The item being re-exported.
     pub(crate) source: ImportSource,
     pub(crate) should_be_displayed: bool,
 }

diff --git a/tests/rustdoc/reexport-doc-hidden-inside-private.rs b/tests/rustdoc/reexport-doc-hidden-inside-private.rs
@@ -1,4 +1,4 @@
-// This test ensures that a re-export of  `#[doc(hidden)]` item inside a private
+// This test ensures that a re-export of `#[doc(hidden)]` item inside a private
 // module will still be displayed (the re-export, not the item).
 
 #![crate_name = "foo"]
+1 −1		src/comments.md
+6 −0		src/conditional-compilation.md
+1 −1		src/expressions/call-expr.md
+27 −2		src/inline-assembly.md
+1 −1		src/paths.md
+2 −2		CONTRIBUTING.md
+4 −4		src/conversion/from_into.md
+1 −1		src/conversion/string.md
+11 −4		src/error/option_unwrap/and_then.md
+6 −1		src/flow_control/let_else.md
+6 −0		src/flow_control/match/destructuring/destructure_structures.md
+2 −2		src/fn/closures/closure_examples/iter_find.md
+1 −1		src/hello/print.md
+1 −1		src/types/cast.md
+3 −2		src/unsafe/asm.md
+1 −0		src/SUMMARY.md
+1 −1		src/backend/implicit-caller-location.md
+5 −2		src/building/how-to-build-and-run.md
+1 −1		src/compiler-team.md
+1 −1		src/const-eval.md
+4 −4		src/name-resolution.md
+2 −2		src/notification-groups/about.md
+4 −4		src/rustbot.md
+50 −0		src/solve/proof-trees.md
+3 −3		src/tests/compiletest.md
+1 −1		src/thir.md
+1 −1		src/traits/resolution.md