Skip to content

Commit 53a1b3d

Browse files
committed
Auto merge of #138416 - Manishearth:rollup-fejor9p, r=Manishearth
Rollup of 12 pull requests Successful merges: - #134076 (Stabilize `std::io::ErrorKind::InvalidFilename`) - #137504 (Move methods from Map to TyCtxt, part 4.) - #138175 (Support rmeta inputs for --crate-type=bin --emit=obj) - #138259 (Disentangle `ForwardGenericParamBan` and `ConstParamTy` ribs) - #138280 (fix ICE in pretty-printing `global_asm!`) - #138318 (Rustdoc: remove a bunch of `@ts-expect-error` from main.js) - #138331 (Use `RUSTC_LINT_FLAGS` more) - #138357 (merge `TypeChecker` and `TypeVerifier`) - #138394 (remove unnecessary variant) - #138403 (Delegation: one more ICE fix for `MethodCall` generation) - #138407 (Delegation: reject C-variadics) - #138409 (Use sa_sigaction instead of sa_union.__su_sigaction for AIX) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 49fb487 + a231189 commit 53a1b3d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/hir.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ defined in the map. By matching on this, you can find out what sort of
139139
node the `HirId` referred to and also get a pointer to the data
140140
itself. Often, you know what sort of node `n` is – e.g. if you know
141141
that `n` must be some HIR expression, you can do
142-
[`tcx.hir().expect_expr(n)`][expect_expr], which will extract and return the
142+
[`tcx.hir_expect_expr(n)`][expect_expr], which will extract and return the
143143
[`&hir::Expr`][Expr], panicking if `n` is not in fact an expression.
144144

145145
[find]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/hir/map/struct.Map.html#method.find
146146
[`Node`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir/enum.Node.html
147-
[expect_expr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/hir/map/struct.Map.html#method.expect_expr
147+
[expect_expr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TyCtxt.html#method.expect_expr
148148
[Expr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir/struct.Expr.html
149149

150150
Finally, you can use the HIR map to find the parents of nodes, via

0 commit comments

Comments
 (0)