Remove body_def_id from Inherited
#108960
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
rustbot
added
S-waiting-on-review
|
Some changes occurred in need_type_info.rs cc @lcnr |
compiler-errors
force-pushed
the
no-body-def-id
branch
from
c2ed166 to
fd34549
Compare
compiler-errors
commented
Mar 9, 2023
Comment on lines
+406
to
+408
| if let Some(body_id) = self.tcx.hir().maybe_body_owned_by( | ||
| self.tcx.typeck_root_def_id(body_def_id.to_def_id()).expect_local(), | ||
| ) { |
There was a problem hiding this comment.
This is the only "interesting" part of this PR, I think.
There was a problem hiding this comment.
Oh oh oh :), this is what I needed :), typeck_root_def_id, I was trying something very similar in my last PR.
spastorino
approved these changes
Mar 10, 2023
|
Great! That's as much possible confusion removed. |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 10, 2023
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#108879 (Unconstrained terms should account for infer vars being equated) - rust-lang#108936 (Rustdoc: don't hide anonymous reexport) - rust-lang#108940 (Add myself to compiler reviewers list) - rust-lang#108945 (Make some report and emit errors take DefIds instead of BodyIds) - rust-lang#108946 (Document the resulting values produced when using `From<bool>` on floats) - rust-lang#108956 (Make ptr::from_ref and ptr::from_mut in rust-lang#106116 const.) - rust-lang#108960 (Remove `body_def_id` from `Inherited`) - rust-lang#108963 (only call git on git checkouts during bootstrap) - rust-lang#108964 (Fix the docs for pointer method with_metadata_of) Failed merges: - rust-lang#108950 (Directly construct Inherited in typeck.) 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.
We can just use the body id from the obligation cause.
Follow-up to #108945, only my commit is relevant.
r? @cjgillot cc @spastorino