-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Use a single lifetime for MIR construction #61426
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conversation
@@ -6,7 +6,7 @@ use crate::hair::*; | |||
use rustc::middle::region; | |||
use rustc::mir::*; | |||
|
|||
impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> { | |||
impl<'a, 'tcx> Builder<'a, 'tcx> { |
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.
You can replace headers like these with impl Builder<'_, 'tcx>
if you want.
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 feel like this is a job for rustfmt, not me =P
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.
Not rustfmt
but maybe rustfix
. Don't know if we have a lint for it yet though.
src/librustc_mir/build/mod.rs
Outdated
body_id: hir::BodyId) | ||
-> Ty<'tcx> { | ||
fn liberated_closure_env_ty<'a, 'tcx>( | ||
tcx: TyCtxt<'a, 'tcx, 'tcx>, |
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.
This can be TyCtxt<'_, 'tcx, 'tcx>
without the <'a, 'tcx>
on the previous line.
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.
LGTM, modulo potential further lifetime cleanups. cc @pnkfelix @nikomatsakis @matthewjasper
☔ The latest upstream changes (presumably #61276) made this pull request unmergeable. Please resolve the merge conflicts. |
1d138de
to
b23f682
Compare
@bors try |
⌛ Trying commit b23f682e98354be01ebee7081e50b2110a7228fb with merge c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600... |
☀️ Try build successful - checks-travis |
@rust-timer build c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600 |
Success: Queued c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600 with parent 7096ff0, comparison URL. |
Finished benchmarking try commit c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600, comparison URL. |
b23f682
to
5d8290c
Compare
5d8290c
to
d3e1181
Compare
@bors r+ rollup=never p=5 |
📌 Commit d3e1181 has been approved by |
☀️ Test successful - checks-travis, status-appveyor |
Builds on #57214
r? @eddyb