Pass the right HIR back from get_fn_decl
#109248
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @TaKO8Ki (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
compiler-errors
force-pushed
the
get_fn_decl-aaa
branch
from
1d48324 to
08c9132
Compare
|
@bors r=WaffleLapkin rollup (diagnostics only) |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 17, 2023
…=WaffleLapkin Pass the right HIR back from `get_fn_decl` Fixes rust-lang#109232 Makes sure that the `fn_id: HirId` that we pass to `suggest_missing_return_type` matches up with the `fn_decl: hir::FnDecl` that we pass to it, so the late-bound vars that we fetch from the former match up with the types in the latter... This HIR suggestion code really needs a big refactor. I've tried to do it in the past (a couple of attempts), but it's a super tangled mess. It really shouldn't be passing around things like `hir::Node` and just deal with `LocalDefId`s everywhere... Anyways, I'd rather fix this ICE, now.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 17, 2023
…=WaffleLapkin Pass the right HIR back from `get_fn_decl` Fixes rust-lang#109232 Makes sure that the `fn_id: HirId` that we pass to `suggest_missing_return_type` matches up with the `fn_decl: hir::FnDecl` that we pass to it, so the late-bound vars that we fetch from the former match up with the types in the latter... This HIR suggestion code really needs a big refactor. I've tried to do it in the past (a couple of attempts), but it's a super tangled mess. It really shouldn't be passing around things like `hir::Node` and just deal with `LocalDefId`s everywhere... Anyways, I'd rather fix this ICE, now.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 17, 2023
…=WaffleLapkin Pass the right HIR back from `get_fn_decl` Fixes rust-lang#109232 Makes sure that the `fn_id: HirId` that we pass to `suggest_missing_return_type` matches up with the `fn_decl: hir::FnDecl` that we pass to it, so the late-bound vars that we fetch from the former match up with the types in the latter... This HIR suggestion code really needs a big refactor. I've tried to do it in the past (a couple of attempts), but it's a super tangled mess. It really shouldn't be passing around things like `hir::Node` and just deal with `LocalDefId`s everywhere... Anyways, I'd rather fix this ICE, now.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 18, 2023
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#109102 (Erase escaping late-bound regions when probing for ambiguous associated types) - rust-lang#109200 (Fix index out of bounds in `suggest_trait_fn_ty_for_impl_fn_infer`) - rust-lang#109211 (E0206 - update description ) - rust-lang#109222 (Do not ICE for unexpected lifetime with ConstGeneric rib) - rust-lang#109235 (fallback to lstat when stat fails on Windows) - rust-lang#109248 (Pass the right HIR back from `get_fn_decl`) - rust-lang#109251 (Suggest surrounding the macro with `{}` to interpret as a statement) - rust-lang#109256 (Check for llvm-tools before install) - rust-lang#109257 (resolve: Improve debug impls for `NameBinding`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #109232
Makes sure that the
fn_id: HirIdthat we pass tosuggest_missing_return_typematches up with thefn_decl: hir::FnDeclthat we pass to it, so the late-bound vars that we fetch from the former match up with the types in the latter...This HIR suggestion code really needs a big refactor. I've tried to do it in the past (a couple of attempts), but it's a super tangled mess. It really shouldn't be passing around things like
hir::Nodeand just deal withLocalDefIds everywhere... Anyways, I'd rather fix this ICE, now.