diff options
| author | bors <bors@rust-lang.org> | 2024-05-30 08:00:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-30 08:00:11 +0000 |
| commit | d43930dab36b81267d436fd16066419d3a66e054 (patch) | |
| tree | 1bf06acd6872904d9bc1899203d8145642dddbef /compiler/rustc_hir | |
| parent | 32a3ed229caaaa6476ee1b0e644dd53579454536 (diff) | |
| parent | a34c26e7ecfbfe3f4fd5fbd4868a0cba5676e6a5 (diff) | |
| download | rust-d43930dab36b81267d436fd16066419d3a66e054.tar.gz rust-d43930dab36b81267d436fd16066419d3a66e054.zip | |
Auto merge of #125711 - oli-obk:const_block_ice2, r=Nadrieril
Make `body_owned_by` return the `Body` instead of just the `BodyId` fixes #125677 Almost all `body_owned_by` callers immediately called `body`, too, so just return `Body` directly. This makes the inline-const query feeding more robust, as all calls to `body_owned_by` will now yield a body for inline consts, too. I have not yet figured out a good way to make `tcx.hir().body()` return an inline-const body, but that can be done as a follow-up
Diffstat (limited to 'compiler/rustc_hir')
| -rw-r--r-- | compiler/rustc_hir/src/intravisit.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_hir/src/intravisit.rs b/compiler/rustc_hir/src/intravisit.rs index aba0532f0d1..63ddb22c5ab 100644 --- a/compiler/rustc_hir/src/intravisit.rs +++ b/compiler/rustc_hir/src/intravisit.rs @@ -299,7 +299,7 @@ pub trait Visitor<'v>: Sized { walk_item(self, i) } - fn visit_body(&mut self, b: &'v Body<'v>) -> Self::Result { + fn visit_body(&mut self, b: &Body<'v>) -> Self::Result { walk_body(self, b) } @@ -578,7 +578,7 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item<'v>) -> V:: V::Result::output() } -pub fn walk_body<'v, V: Visitor<'v>>(visitor: &mut V, body: &'v Body<'v>) -> V::Result { +pub fn walk_body<'v, V: Visitor<'v>>(visitor: &mut V, body: &Body<'v>) -> V::Result { walk_list!(visitor, visit_param, body.params); visitor.visit_expr(body.value) } |
