Skip to content

Commit 5adc54f

Browse files
committed
Auto merge of #109500 - petrochenkov:modchainld, r=oli-obk
resolve: Preserve reexport chains in `ModChild`ren This may be potentially useful for - avoiding uses of `hir::ItemKind::Use` (which usually lead to correctness issues) - preserving documentation comments on all reexports, including those from other crates - preserving and checking stability/deprecation info on reexports - all kinds of diagnostics The second commit then migrates some hacky logic from rustdoc to `module_reexports` to make it simpler and more correct. Ideally rustdoc should use `module_reexports` immediately at the top level, so `hir::ItemKind::Use`s are never used. The second commit also fixes issues with rust-lang/rust#109330 and therefore Fixes rust-lang/rust#109631 Fixes rust-lang/rust#109614 Fixes rust-lang/rust#109424
2 parents 08dea20 + 4698385 commit 5adc54f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

std/src/collections/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,10 @@ pub use alloc_crate::collections::{BTreeMap, BTreeSet, BinaryHeap};
416416
pub use alloc_crate::collections::{LinkedList, VecDeque};
417417

418418
#[stable(feature = "rust1", since = "1.0.0")]
419+
#[doc(inline)]
419420
pub use self::hash_map::HashMap;
420421
#[stable(feature = "rust1", since = "1.0.0")]
422+
#[doc(inline)]
421423
pub use self::hash_set::HashSet;
422424

423425
#[stable(feature = "try_reserve", since = "1.57.0")]

0 commit comments

Comments
 (0)