Skip to content

Commit b6b204e

Browse files
committed
Auto merge of #137163 - matthiaskrgr:rollup-ovgfkns, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #136466 (Start removing `rustc_middle::hir::map::Map`) - #136671 (Overhaul `rustc_middle::limits`) - #136817 (Pattern Migration 2024: clean up and comment) - #136844 (Use `const_error!` when possible) - #137080 (bootstrap: add more tracing to compiler/std/llvm flows) - #137101 (`invalid_from_utf8[_unchecked]`: also lint inherent methods) - #137140 (Fix const items not being allowed to be called `r#move` or `r#static`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b81c7f0 + ffcce13 commit b6b204e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

examples/rustc-driver-interacting-with-the-ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl rustc_driver::Callbacks for MyCallbacks {
7575
let item = hir_krate.item(id);
7676
// Use pattern-matching to find a specific node inside the main function.
7777
if let rustc_hir::ItemKind::Fn(_, _, body_id) = item.kind {
78-
let expr = &tcx.hir().body(body_id).value;
78+
let expr = &tcx.hir_body(body_id).value;
7979
if let rustc_hir::ExprKind::Block(block, _) = expr.kind {
8080
if let rustc_hir::StmtKind::Let(let_stmt) = block.stmts[0].kind {
8181
if let Some(expr) = let_stmt.init {

src/building/bootstrapping/debugging-bootstrap.md

+8
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ $ BOOTSTRAP_TRACING=CONFIG_HANDLING=TRACE ./x build library --stage 1
7676

7777
[tracing-env-filter]: https://docs.rs/tracing-subscriber/0.3.19/tracing_subscriber/filter/struct.EnvFilter.html
7878

79+
##### FIXME(#96176): specific tracing for `compiler()` vs `compiler_for()`
80+
81+
The additional targets `COMPILER` and `COMPILER_FOR` are used to help trace what
82+
`builder.compiler()` and `builder.compiler_for()` does. They should be removed
83+
if [#96176][cleanup-compiler-for] is resolved.
84+
85+
[cleanup-compiler-for]: https://github.com/rust-lang/rust/issues/96176
86+
7987
### Using `tracing` in bootstrap
8088

8189
Both `tracing::*` macros and the `tracing::instrument` proc-macro attribute need to be gated behind `tracing` feature. Examples:

0 commit comments

Comments
 (0)