diff options
| author | bors <bors@rust-lang.org> | 2023-04-09 13:05:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-09 13:05:56 +0000 |
| commit | 7201301df6afe8b68c6a8f5d2abba67bbba435ea (patch) | |
| tree | 2ef2b24cdda8c266e98cf4d06f9fc9ffcc3f12f3 /library/std/src | |
| parent | 56e0626836d92973cd12cb505179eef9795efc61 (diff) | |
| parent | 9da9373bf0ebaf5fb2e4911d263a1950e2306157 (diff) | |
| download | rust-7201301df6afe8b68c6a8f5d2abba67bbba435ea.tar.gz rust-7201301df6afe8b68c6a8f5d2abba67bbba435ea.zip | |
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 https://github.com/rust-lang/rust/pull/109330 and therefore Fixes https://github.com/rust-lang/rust/issues/109631 Fixes https://github.com/rust-lang/rust/issues/109614 Fixes https://github.com/rust-lang/rust/issues/109424
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/collections/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/collections/mod.rs b/library/std/src/collections/mod.rs index ae2baba09e6..575f56ff4df 100644 --- a/library/std/src/collections/mod.rs +++ b/library/std/src/collections/mod.rs @@ -416,8 +416,10 @@ pub use alloc_crate::collections::{BTreeMap, BTreeSet, BinaryHeap}; pub use alloc_crate::collections::{LinkedList, VecDeque}; #[stable(feature = "rust1", since = "1.0.0")] +#[doc(inline)] pub use self::hash_map::HashMap; #[stable(feature = "rust1", since = "1.0.0")] +#[doc(inline)] pub use self::hash_set::HashSet; #[stable(feature = "try_reserve", since = "1.57.0")] |