Skip to content

Use a single lifetime for MIR construction - #61426

Merged
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:just-tcx-mir-building
Jun 12, 2019
Merged

Use a single lifetime for MIR construction#61426
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:just-tcx-mir-building

Conversation

@Zoxc

@ZoxcZoxc commented Jun 1, 2019

Copy link
Copy Markdown
Contributor

Builds on #57214

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2019
eddyb
eddyb reviewed Jun 2, 2019
View reviewed changes
Comment threadsrc/librustc_mir/build/expr/as_temp.rs Outdated

@eddybeddybJun 2, 2019

Copy link
Copy Markdown
Contributor

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.

@ZoxcZoxcJun 4, 2019

Copy link
Copy Markdown
ContributorAuthor

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

@eddybeddybJun 5, 2019

Copy link
Copy Markdown
Contributor

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.

eddyb
eddyb reviewed Jun 2, 2019
View reviewed changes
Comment threadsrc/librustc_mir/build/mod.rs Outdated

@eddybeddybJun 2, 2019

Copy link
Copy Markdown
Contributor

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.

eddyb
eddyb approved these changes Jun 2, 2019
View reviewed changes

@eddybeddyb left a comment

Copy link
Copy Markdown
Contributor

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

bors commented Jun 2, 2019

Copy link
Copy Markdown
Collaborator

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

@Zoxc
Zoxcforce-pushed the just-tcx-mir-building branch from 1d138de to b23f682CompareJune 3, 2019 14:32
@Zoxc

Zoxc commented Jun 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Jun 3, 2019

Copy link
Copy Markdown
Collaborator

⌛ Trying commit b23f682e98354be01ebee7081e50b2110a7228fb with merge c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600...

@bors

bors commented Jun 3, 2019

Copy link
Copy Markdown
Collaborator

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

@Zoxc

Zoxc commented Jun 4, 2019

Copy link
Copy Markdown
ContributorAuthor

@rust-timer build c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600

@rust-timer

rust-timer commented Jun 4, 2019

Copy link
Copy Markdown
Collaborator

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

@rust-timer

rust-timer commented Jun 4, 2019

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit c0d6d4a069cb719fc05ca0a0aa4700f4e4a16600, comparison URL.

@Zoxc
Zoxcforce-pushed the just-tcx-mir-building branch from b23f682 to 5d8290cCompareJune 12, 2019 17:08
@Zoxc
Zoxcforce-pushed the just-tcx-mir-building branch from 5d8290c to d3e1181CompareJune 12, 2019 17:27
@eddyb

eddyb commented Jun 12, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup=never p=5

@bors

bors commented Jun 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit d3e1181 has been approved by eddyb

@borsbors 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

bors commented Jun 12, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d3e1181 with merge 2887008...

bors added a commit that referenced this pull request Jun 12, 2019
@bors
Auto merge of#61426- Zoxc:just-tcx-mir-building, r=eddyb
2887008
Use a single lifetime for MIR construction
Builds on #57214
r? @eddyb
@bors

bors commented Jun 12, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2019
@bors
bors merged commit d3e1181 into rust-lang:masterJun 12, 2019
@Zoxc
Zoxc deleted the just-tcx-mir-building branch June 12, 2019 22:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Zoxc@bors@rust-timer@eddyb@rust-highfive