Skip to content

Commit

Permalink
Auto merge of #109500 - petrochenkov:modchainld, r=oli-obk
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Apr 9, 2023
2 parents 08dea20 + 4698385 commit 5adc54f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions std/src/collections/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down

0 comments on commit 5adc54f

Please sign in to comment.