Skip to content

Upgrade Chalk to 0.21 - #75173

Merged
bors merged 5 commits into
rust-lang:masterfrom
jackh726:chalk-0.21
Sep 5, 2020
Merged

Upgrade Chalk to 0.21#75173
bors merged 5 commits into
rust-lang:masterfrom
jackh726:chalk-0.21

Conversation

@jackh726

@jackh726jackh726 commented Aug 5, 2020

Copy link
Copy Markdown
Member

Two commits here. First commit actually does the upgrade. Second commit has some changes to make more tests in compare-mode=chalk pass.

The PlaceholdersCollector and RegionsSubstitutor bits are bit a hacky, but only insomuch as ParamsSubstitutor is. These won't be needed eventually.

r? @nikomatsakis

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2020
@jackh726jackh726 closed this Aug 5, 2020
@jackh726jackh726 reopened this Aug 5, 2020
@bors

bors commented Aug 8, 2020

Copy link
Copy Markdown
Collaborator

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

@vandenheuvelvandenheuvel mentioned this pull request Aug 13, 2020
Closed
@jackh726

jackh726 commented Aug 13, 2020

Copy link
Copy Markdown
MemberAuthor

@nikomatsakis gentle ping on this. I'll rebase after review, since there might be comments anyways.

detrumi
detrumi reviewed Aug 14, 2020
View reviewed changes
Comment threadsrc/librustc_middle/traits/chalk.rs Outdated
Comment threadsrc/librustc_middle/traits/chalk.rs Outdated
Comment threadsrc/librustc_traits/chalk/db.rs Outdated
Comment threadsrc/librustc_traits/chalk/db.rs Outdated

@detrumidetrumiAug 14, 2020

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.

Is this comment still relevant?

@jackh726jackh726Aug 16, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Comment threadsrc/librustc_traits/chalk/db.rs Outdated
Comment threadsrc/librustc_traits/chalk/lowering.rs Outdated
Comment threadsrc/librustc_traits/chalk/lowering.rs Outdated

@detrumidetrumiAug 14, 2020

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.

Can be moved to the wildcard match, I think? Same with visit_region

@jackh726jackh726Aug 16, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmm no, because this returns bool

Comment threadsrc/librustc_traits/chalk/mod.rs Outdated

@detrumidetrumiAug 14, 2020

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.

I think this can be removed?

@jackh726jackh726Aug 16, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's unused yes, but it's here as a reminder to use it eventually. I left a FIXME comment.

Comment threadsrc/librustc_traits/chalk/mod.rs Outdated
Comment threadsrc/librustc_traits/chalk/mod.rs Outdated
@bors

bors commented Aug 18, 2020

Copy link
Copy Markdown
Collaborator

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

nikomatsakis
nikomatsakis approved these changes Sep 2, 2020
View reviewed changes

@nikomatsakisnikomatsakis 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.

r=me when rebased!

@jackh726

jackh726 commented Sep 2, 2020

Copy link
Copy Markdown
MemberAuthor

Rebased.

@nikomatsakis

nikomatsakis commented Sep 3, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 3, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 7052197d73247b40c9b1413f276ba792d9aeafd3 has been approved by nikomatsakis

@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 Sep 3, 2020
@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7052197d73247b40c9b1413f276ba792d9aeafd3 with merge 46195f03f1857ace1cbbe9bc877364b430a0c10b...

@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 4, 2020
@jackh726

jackh726 commented Sep 4, 2020

Copy link
Copy Markdown
MemberAuthor

Needs a rebase. Kind of expected this seeing the bors queue this morning. Let me do that.

@nikomatsakis

nikomatsakis commented Sep 4, 2020

Copy link
Copy Markdown
Contributor

@bors delegate+ r+

@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

✌️ @jackh726 can now approve this pull request

@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit fafdfaf has been approved by nikomatsakis

@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 Sep 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 4, 2020
@Dylan-DPC
Rollup merge ofrust-lang#75173- jackh726:chalk-0.21, r=nikomatsakis
30ab587
Upgrade Chalk to 0.21
Two commits here. First commit actually does the upgrade. Second commit has some changes to make more tests in compare-mode=chalk pass.
The `PlaceholdersCollector` and `RegionsSubstitutor` bits are bit a hacky, but only insomuch as `ParamsSubstitutor` is. These won't be needed eventually.
r? @nikomatsakis
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Sep 4, 2020
Closed
@Dylan-DPC-zz

Dylan-DPC-zz commented Sep 4, 2020

Copy link
Copy Markdown

failed in rollup

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 4, 2020
@jackh726

jackh726 commented Sep 4, 2020

Copy link
Copy Markdown
MemberAuthor

Welp another rebase needed.

@jackh726

jackh726 commented Sep 5, 2020

Copy link
Copy Markdown
MemberAuthor

@bors r=nikomatsakis

@bors

bors commented Sep 5, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0aa2153 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 5, 2020
@bors

bors commented Sep 5, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0aa2153 with merge c336478...

@bors

bors commented Sep 5, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: nikomatsakis
Pushing c336478 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 5, 2020
@bors
bors merged commit c336478 into rust-lang:masterSep 5, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 5, 2020
This was referenced Sep 5, 2020
Merged
Merged
Closed
@jackh726
jackh726 deleted the chalk-0.21 branch September 5, 2020 07:45
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes
+1 more reviewer
@detrumidetrumidetrumi left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakisnikomatsakis

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

1.48.0

Development

Successfully merging this pull request may close these issues.

7 participants

@jackh726@bors@nikomatsakis@Dylan-DPC-zz@detrumi@rust-highfive@rustbot