Move some methods from `tcx.hir()` to `tcx` #118500

zetanumbers · 2023-12-01T13:38:04Z

#118256 (comment)

Renamed:

find -> opt_hir_node
get -> hir_node
find_by_def_id -> opt_hir_node_by_def_id
get_by_def_id -> hir_node_by_def_id

rustbot · 2023-12-01T13:38:13Z

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-12-01T13:38:16Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

The Miri subtree was changed

cc @rust-lang/miri

zetanumbers · 2023-12-01T13:39:12Z

r? @petrochenkov

rustbot · 2023-12-01T13:46:01Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

The Miri subtree was changed

cc @rust-lang/miri

compiler/rustc_middle/src/hir/map/mod.rs

petrochenkov · 2023-12-01T14:27:52Z

Are there any cases where

let hir_id = tcx.(opt_)local_def_id_to_hir_id(def_id);
tcx.(opt_)hir_node(hir_id);

could be replaced with

tcx.(opt_)hir_node_by_def_id(def_id);

?

(I.e. where hir_id is only evaluated to be passed to hir_node.)

petrochenkov · 2023-12-01T14:29:05Z

I also suspect that many opt_hir_node(_by_def_id)s across the compiler can be replaced with non-optional hir_node(_by_def_id)s, but that's a separate task, not for this PR.

rustbot · 2023-12-12T09:32:52Z

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/cargo

cc @ehuss

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs and change-id in config.example.toml.

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in GUI tests.

cc @GuillaumeGomez

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @jsha

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs and change-id in config.example.toml.

zetanumbers · 2023-12-12T09:50:31Z

Oh no, I'm so sorry for pinging everyone! It was my error with git, I've fixed it. I'm sorry!

zetanumbers · 2023-12-12T09:56:14Z

Is there a way to reset the ping or delete rustbot's message?

ouz-a · 2023-12-12T09:57:40Z

Don't worry about it this kind of accidents do happen 😄

petrochenkov · 2023-12-12T14:21:34Z

r=me after squashing commits and making CI green.

Renamings: - find -> opt_hir_node - get -> hir_node - find_by_def_id -> opt_hir_node_by_def_id - get_by_def_id -> hir_node_by_def_id Fix rebase changes using removed methods Use `tcx.hir_node_by_def_id()` whenever possible in compiler Fix clippy errors Fix compiler Apply suggestions from code review Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com> Add FIXME for `tcx.hir()` returned type about its removal Simplify with with `tcx.hir_node_by_def_id`

zetanumbers · 2023-12-12T15:32:50Z

All set and done chief @petrochenkov

petrochenkov · 2023-12-12T15:39:06Z

@bors r+

bors · 2023-12-12T15:39:08Z

📌 Commit 24f009c has been approved by petrochenkov

It is now in the queue for this repository.

…trochenkov Move some methods from `tcx.hir()` to `tcx` rust-lang#118256 (comment) Renamed: - find -> opt_hir_node - get -> hir_node - find_by_def_id -> opt_hir_node_by_def_id - get_by_def_id -> hir_node_by_def_id

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#117050 ([`RFC 3086`] Attempt to try to resolve blocking concerns ) - rust-lang#118500 (Move some methods from `tcx.hir()` to `tcx`) - rust-lang#118871 (Coroutine variant fields can be uninitialized) - rust-lang#118872 (Add rustX check to codeblock attributes lint) - rust-lang#118884 (NFC: simplify merging of two vecs) - rust-lang#118885 (clippy::complexity fixes) - rust-lang#118886 (Clean up variables in `search.js`) - rust-lang#118887 (Typo) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-12-13T10:32:00Z

⌛ Testing commit 24f009c with merge 56d25ba...

bors · 2023-12-13T12:28:50Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 56d25ba to master...

rust-timer · 2023-12-13T13:50:45Z

Finished benchmarking commit (56d25ba): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.003s -> 671.712s (-0.04%)
Artifact size: 312.43 MiB -> 312.46 MiB (0.01%)

Update Rust toolchain from nightly-2023-12-13 to nightly-2023-12-14 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@3340d49 up to rust-lang@eeff92a. The log for this commit range is: rust-lang@eeff92ad32 Auto merge of rust-lang#118402 - notriddle:notriddle/ranking-and-filtering, r=GuillaumeGomez rust-lang@a90372c6e8 Auto merge of rust-lang#118213 - Urgau:check-cfg-diagnostics-rustc-cargo, r=petrochenkov rust-lang@2862500152 Auto merge of rust-lang#118919 - matthiaskrgr:rollup-02udckl, r=matthiaskrgr rust-lang@bec6672984 rustdoc-search: clean up handleSingleArg type handling rust-lang@9dfcf131b3 rustdoc-search: better hashing, faster unification rust-lang@9a9695a052 rustdoc-search: use set ops for ranking and filtering rust-lang@fd1d256d61 rustdoc-search: remove the now-redundant `validateResult` rust-lang@251d1af0d2 Rollup merge of rust-lang#118906 - Kobzol:bootstrap-is-windows, r=petrochenkov rust-lang@666353e7ba Rollup merge of rust-lang#118883 - HosseinAssaran:patch-1, r=fmease rust-lang@1dd36119d0 Rollup merge of rust-lang#118871 - tmiasko:coroutine-maybe-uninit-fields, r=compiler-errors rust-lang@dbc6ec6636 Rollup merge of rust-lang#118759 - compiler-errors:bare-unit-structs, r=petrochenkov rust-lang@f6617d050d Remove dangling check-cfg ui tests files rust-lang@5345a166fe Add more suggestion to unexpected cfg names and values rust-lang@7176b8babd Auto merge of rust-lang#118894 - dtolnay:bootstrapwrite, r=onur-ozkan rust-lang@c3def263a4 Auto merge of rust-lang#118870 - Enselic:rustc_passes-query-stability, r=compiler-errors rust-lang@56d25ba5ea Auto merge of rust-lang#118500 - ZetaNumbers:tcx_hir_refactor, r=petrochenkov rust-lang@2fdd9eda0c Auto merge of rust-lang#118534 - RalfJung:extern-type-size-of-val, r=WaffleLapkin rust-lang@066e6ffa02 Fix LLD thread flag selection for Windows targets rust-lang@c5208518fa Add `TargetSelection::is_windows` method rust-lang@f651b436ce Auto merge of rust-lang#117050 - c410-f3r:here-we-go-again, r=petrochenkov rust-lang@9f1bfe53b6 Auto merge of rust-lang#118900 - workingjubilee:rollup-wkv9hq1, r=workingjubilee rust-lang@f9078a40ee Rollup merge of rust-lang#118891 - compiler-errors:async-gen-blocks, r=eholk rust-lang@4583a0134f Rollup merge of rust-lang#118889 - matthiaskrgr:compl_2023_2, r=WaffleLapkin rust-lang@df0686b629 Rollup merge of rust-lang#118887 - smoelius:patch-1, r=Nilstrieb rust-lang@2f937c720d Rollup merge of rust-lang#118886 - GuillaumeGomez:clean-up-search-vars, r=notriddle rust-lang@5308733112 Rollup merge of rust-lang#118885 - matthiaskrgr:compl_2023, r=compiler-errors rust-lang@89d4a9bee9 Rollup merge of rust-lang#118884 - matthiaskrgr:auszweimacheins, r=Nadrieril rust-lang@18e0966f39 Rollup merge of rust-lang#118873 - lukas-code:fix_waker_getter_tracking_issue_number, r=workingjubilee rust-lang@0430782d1d Rollup merge of rust-lang#118872 - GuillaumeGomez:codeblock-attr-lint, r=notriddle rust-lang@a33f1a3d3a Rollup merge of rust-lang#118864 - farnoy:masked-load-store-fixes, r=workingjubilee rust-lang@2d1d443d7f Rollup merge of rust-lang#118858 - mu001999:dead_code/clean, r=cuviper rust-lang@77d1699756 Auto merge of rust-lang#116438 - ChrisDenton:truncate, r=thomcc rust-lang@b30e94b7bb Unbreak non-unix non-windows bootstrap rust-lang@1d78ce681e Actually parse async gen blocks correctly rust-lang@2a1acc26a0 Update compiler/rustc_pattern_analysis/src/constructor.rs rust-lang@3795cc8eb0 more clippy::complexity fixes rust-lang@046f2dea33 Typo rust-lang@58327c10c5 Add a test for a codeblock with multiple invalid attributes rust-lang@f1342f30a5 Clean up variables in `search.js` rust-lang@d707461a1a clippy::complexity fixes rust-lang@6892fcd690 simplify merging of two vecs rust-lang@a2ffff0708 Change a typo mistake in the-doc-attribute.md rust-lang@f813ccd784 also add a Miri test rust-lang@edcb7aba6b also test projecting to some sized fields at non-zero offset in structs with an extern type tail rust-lang@a47416beb5 test that both size_of_val and align_of_val panic rust-lang@bb0fd665a8 Follow guidelines for lint suggestions rust-lang@98aa20b0a7 Add test for `rustX` codeblock attribute rust-lang@d3cb25f4cf Add `rustX` check to codeblock attributes lint rust-lang@24f009c5e5 Move some methods from `tcx.hir()` to `tcx` rust-lang@04f3adb4a7 fix `waker_getters` tracking issue number rust-lang@e9b16cc2c5 rustc_passes: Enforce `rustc::potential_query_instability` lint rust-lang@95b5a80f47 Fix alignment passed down to LLVM for simd_masked_load rust-lang@fb32eb3529 Clean up CodeBlocks::next code rust-lang@df227f78c6 make it more clear what comments refer to; avoid dangling unaligned references rust-lang@b9c9b3e7a2 remove a cranelift test that doesn't make sense any more rust-lang@9ef1e35166 reject projecting to fields whose offset we cannot compute rust-lang@b1613ebc43 codegen: panic when trying to compute size/align of extern type rust-lang@6c0dbb8cc6 Remove dead codes in core rust-lang@a48cebc4b8 Coroutine variant fields can be uninitialized rust-lang@d473bdfdc3 Support bare unit structs in destructuring assignments rust-lang@0278505691 Attempt to try to resolve blocking concerns rust-lang@c6f7aa0eea Make File::create work on Windows hidden files Co-authored-by: celinval <celinval@users.noreply.github.com>

rustbot assigned davidtwco Dec 1, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 1, 2023

rustbot assigned petrochenkov and unassigned davidtwco Dec 1, 2023

zetanumbers force-pushed the tcx_hir_refactor branch from 057c469 to d990727 Compare December 1, 2023 13:45

RalfJung mentioned this pull request Dec 1, 2023

rustbot sends the same pings multiple times rust-lang/triagebot#1738

Open

This comment has been minimized.

Sign in to view

petrochenkov reviewed Dec 1, 2023

View reviewed changes

compiler/rustc_middle/src/hir/map/mod.rs Show resolved Hide resolved

compiler/rustc_middle/src/hir/map/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_middle/src/hir/map/mod.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2023

This comment has been minimized.

Sign in to view

zetanumbers force-pushed the tcx_hir_refactor branch from bcf6af1 to 527cd1d Compare December 12, 2023 09:46

zetanumbers force-pushed the tcx_hir_refactor branch from 527cd1d to f5da7c4 Compare December 12, 2023 10:53

zetanumbers force-pushed the tcx_hir_refactor branch from 9509ff4 to 24f009c Compare December 12, 2023 14:42

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 12, 2023

matthiaskrgr mentioned this pull request Dec 12, 2023

Rollup of 8 pull requests #118892

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 13, 2023

bors merged commit 56d25ba into rust-lang:master Dec 13, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Dec 13, 2023

xFrednet mentioned this pull request Dec 13, 2023

Chore: Bump nightly -> 2023-12-28 rust-marker/marker#315

Open

zetanumbers deleted the tcx_hir_refactor branch December 13, 2023 13:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move some methods from `tcx.hir()` to `tcx` #118500

Move some methods from `tcx.hir()` to `tcx` #118500

zetanumbers commented Dec 1, 2023 •

edited

Loading

rustbot commented Dec 1, 2023

rustbot commented Dec 1, 2023

zetanumbers commented Dec 1, 2023

rustbot commented Dec 1, 2023

This comment has been minimized.

petrochenkov commented Dec 1, 2023

petrochenkov commented Dec 1, 2023

This comment has been minimized.

This comment has been minimized.

rustbot commented Dec 12, 2023

zetanumbers commented Dec 12, 2023

zetanumbers commented Dec 12, 2023

ouz-a commented Dec 12, 2023

petrochenkov commented Dec 12, 2023

zetanumbers commented Dec 12, 2023 •

edited

Loading

petrochenkov commented Dec 12, 2023

bors commented Dec 12, 2023

bors commented Dec 13, 2023

bors commented Dec 13, 2023

rust-timer commented Dec 13, 2023

Move some methods from tcx.hir() to tcx #118500

Move some methods from tcx.hir() to tcx #118500

Conversation

zetanumbers commented Dec 1, 2023 • edited Loading

rustbot commented Dec 1, 2023

rustbot commented Dec 1, 2023

zetanumbers commented Dec 1, 2023

rustbot commented Dec 1, 2023

This comment has been minimized.

petrochenkov commented Dec 1, 2023

petrochenkov commented Dec 1, 2023

This comment has been minimized.

This comment has been minimized.

rustbot commented Dec 12, 2023

zetanumbers commented Dec 12, 2023

zetanumbers commented Dec 12, 2023

ouz-a commented Dec 12, 2023

petrochenkov commented Dec 12, 2023

zetanumbers commented Dec 12, 2023 • edited Loading

petrochenkov commented Dec 12, 2023

bors commented Dec 12, 2023

bors commented Dec 13, 2023

bors commented Dec 13, 2023

rust-timer commented Dec 13, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Move some methods from `tcx.hir()` to `tcx` #118500

Move some methods from `tcx.hir()` to `tcx` #118500

zetanumbers commented Dec 1, 2023 •

edited

Loading

zetanumbers commented Dec 12, 2023 •

edited

Loading