Skip to content
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

Use a single lifetime for MIR construction #61426

Merged
merged 1 commit into from
Jun 12, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Jun 1, 2019

Builds on #57214

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2019
@@ -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> {
Copy link
Member

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.

Copy link
Contributor Author

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

Copy link
Member

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.

body_id: hir::BodyId)
-> Ty<'tcx> {
fn liberated_closure_env_ty<'a, 'tcx>(
tcx: TyCtxt<'a, 'tcx, 'tcx>,
Copy link
Member

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.

Copy link
Member

@eddyb eddyb left a 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

@bors
Copy link
Contributor

bors commented Jun 2, 2019

☔ The latest upstream changes (presumably #61276) made this pull request unmergeable. Please resolve the merge conflicts.

@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 3, 2019

@bors try

@bors
Copy link
Contributor

bors commented Jun 3, 2019

⌛ Trying commit b23f682e98354be01ebee7081e50b2110a7228fb with merge c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600...

@bors
Copy link
Contributor

bors commented Jun 3, 2019

☀️ Try build successful - checks-travis
Build commit: c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600

@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 4, 2019

@rust-timer build c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600

@rust-timer
Copy link
Collaborator

Success: Queued c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600 with parent 7096ff0, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600, comparison URL.

@eddyb
Copy link
Member

eddyb commented Jun 12, 2019

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 12, 2019

📌 Commit d3e1181 has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 12, 2019
@bors
Copy link
Contributor

bors commented Jun 12, 2019

⌛ Testing commit d3e1181 with merge 2887008...

bors added a commit that referenced this pull request Jun 12, 2019
Use a single lifetime for MIR construction

Builds on #57214

r? @eddyb
@bors
Copy link
Contributor

bors commented Jun 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 2887008 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2019
@bors bors merged commit d3e1181 into rust-lang:master Jun 12, 2019
@Zoxc Zoxc deleted the just-tcx-mir-building branch June 12, 2019 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants