-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove separate indexing of early-bound regions #99821
Conversation
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
96c1f7a
to
2eafc90
Compare
☔ The latest upstream changes (presumably #100063) made this pull request unmergeable. Please resolve the merge conflicts. |
2eafc90
to
da90ec1
Compare
r? rust-lang/compiler |
r? rust-lang/compiler I’ll be out on vacation for a while, so I won’t be able to get to this anytime soon. |
(well, highfive should be adjusted somehow to not pass the buck straight back to the original reviewer ^^) |
I'm not confident reviewing this PR right now. Let's see if rerolling yields comedy. r? rust-lang/compiler |
@@ -1044,6 +1044,11 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> { | |||
record_array!(self.tables.inferred_outlives_of[def_id] <- inferred_outlives); | |||
} | |||
} | |||
if let DefKind::TyParam | DefKind::ConstParam = def_kind { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see other places in this PR were updated to handle DefKind::LifetimeParam | DefKind::TyParam | DefKind::ConstParam
, should this also check for DefKind::LifetimeParam
?
This looks good to me but I'm not an expert in this part of the compiler. r? rust-lang/types |
@bors r+ |
…r-errors Remove separate indexing of early-bound regions ~Based on rust-lang#99728 This PR copies some modifications from rust-lang#97839 around object lifetime defaults. These modifications allow to stop counting generic parameters during lifetime resolution, and rely on the indexing given by `rustc_typeck::collect`.
Rollup of 8 pull requests Successful merges: - rust-lang#98304 (Add MaybeUninit memset test) - rust-lang#98801 (Add a `File::create_new` constructor) - rust-lang#99821 (Remove separate indexing of early-bound regions) - rust-lang#100239 (remove an ineffective check in const_prop) - rust-lang#100337 (Stabilize `std::io::read_to_string`) - rust-lang#100819 (Make use of `[wrapping_]byte_{add,sub}`) - rust-lang#100934 (Remove a panicking branch from `fmt::builders::PadAdapter`) - rust-lang#101000 (Separate CountIsStar from CountIsParam in rustc_parse_format.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Here is the first part of the Cachegrind diff, if that's helpful.
|
The main difference I see between |
Based on #99728.This PR copies some modifications from #97839 around object lifetime defaults.
These modifications allow to stop counting generic parameters during lifetime resolution, and rely on the indexing given by
rustc_typeck::collect
.