Skip to content

Start removing rustc_middle::hir::map::Map #136466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 7 commits into from
Feb 17, 2025
Merged

Start removing rustc_middle::hir::map::Map #136466

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ff6790
Avoid unnecessary use of the `Map` trait.
nnethercote Feb 3, 2025
b51ab7d
Clarify `impl Map for !`.
nnethercote Feb 3, 2025
6021ba0
Rename `rustc_middle/src/hir/map/mod.rs` as `map.rs`.
nnethercote Feb 2, 2025
cd1d84c
Remove unused `Map::hir_node_by_def_id` method.
nnethercote Feb 2, 2025
f86f7ad
Move some `Map` methods onto `TyCtxt`.
nnethercote Feb 2, 2025
661f99b
Overhaul the `intravisit::Map` trait.
nnethercote Feb 3, 2025
f666361
Remove `TyCtxt::hir_krate`.
nnethercote Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove TyCtxt::hir_krate. 
It's a trivial wrapper around the `hir_crate` query with a small number
of uses.
  • Loading branch information
@nnethercote
nnethercote committed Feb 17, 2025
commit f666361caa963c3f41934d5b431af24d8894d159
2 changes: 1 addition & 1 deletion compiler/rustc_driver_impl/src/pretty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ pub fn print<'tcx>(sess: &Session, ppm: PpMode, ex: PrintExtra<'tcx>) {
}
HirTree => {
debug!("pretty printing HIR tree");
format!("{:#?}", ex.tcx().hir_krate())
format!("{:#?}", ex.tcx().hir_crate(()))
}
Mir => {
let mut out = Vec::new();
Expand Down
8 changes: 1 addition & 7 deletions compiler/rustc_middle/src/hir/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,6 @@ impl<'tcx> TyCtxt<'tcx> {
self.hir_node(self.parent_hir_id(hir_id))
}

/// Best avoided in favour of more targeted methods. See the comment on the `hir_crate` query.
#[inline]
pub fn hir_krate(self) -> &'tcx Crate<'tcx> {
self.hir_crate(())
}

#[inline]
pub fn hir_root_module(self) -> &'tcx Mod<'tcx> {
match self.hir_owner_node(CRATE_OWNER_ID) {
Expand Down Expand Up @@ -414,7 +408,7 @@ impl<'hir> Map<'hir> {
where
V: Visitor<'hir>,
{
let krate = self.tcx.hir_krate();
let krate = self.tcx.hir_crate(());
for info in krate.owners.iter() {
if let MaybeOwner::Owner(info) = info {
for attrs in info.attrs.map.values() {
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ pub(crate) fn run_global_ctxt(
ctxt.external_traits.insert(sized_trait_did, sized_trait);
}

debug!("crate: {:?}", tcx.hir_krate());
debug!("crate: {:?}", tcx.hir_crate(()));

let mut krate = tcx.sess.time("clean_crate", || clean::krate(&mut ctxt));

Expand Down