Upgrade Chalk by jackh726 · Pull Request #72936 · rust-lang/rust

jackh726 · 2020-06-03T02:02:48Z

Things done in this PR:

Upgrade Chalk to 0.11.0
Added compare-mode=chalk
Bump rustc-hash in librustc_data_structures to 1.1.0 to match Chalk
Removed RustDefId since the builtin type support is there
Add a few more FIXME(chalk)s for problem spots I hit when running all tests with chalk
Added some more implementation code for some newer builtin Chalk types (e.g. FnDef, Array)
Lower RegionOutlives and ObjectSafe predicates
Lower Dyn without the region
Handle Int/Float CanonicalVarKinds
Uncomment some Chalk tests that actually work now
Remove the revisions in src/test/ui/coherence/coherence-subtyping.rs since they aren't doing anything different

r? @nikomatsakis

nikomatsakis

Looking good! Exciting to see the progress here. Left some nits.

src/librustc_traits/chalk/db.rs

src/librustc_traits/chalk/mod.rs

src/librustc_middle/traits/chalk.rs

src/librustc_traits/chalk/db.rs

bors · 2020-06-03T12:43:13Z

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

jackh726 · 2020-06-03T16:30:53Z

@nikomatsakis addressed your comments

Removed the commented out assert
Changed skip_binders to no_bound_vars().expect(). This requires collecting into an intermediate Vec, since inputs() returns a slice, which doesn't impl TypeFoldable. But since this is going to be fixed on the Chalk side anyways, I don't think this is a problem right now. It did catch the fact that we were ignoring this in the inherent_impl test, so I commented out the bits of code that fail now :(
Can't change InternedAdtDef to AdtDef since it has a Copy bound and AdtDef isn't.

nikomatsakis · 2020-06-04T22:05:58Z

@bors r+

bors · 2020-06-04T22:05:59Z

📌 Commit fc8e10d5965c1d4954706cc080ba3a1b0bf06879 has been approved by nikomatsakis

bors · 2020-06-06T12:47:04Z

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

jackh726 · 2020-06-07T19:13:26Z

I rebased. Can I get this r+ed again? @nikomatsakis

Aaron1011 · 2020-06-08T01:55:52Z

@jackh726: It looks like you've modified the llvm-project submodule: was that intentional?

jackh726 · 2020-06-08T03:26:47Z

@Aaron1011 😔 no that happened during rebase. Fixed.

nikomatsakis · 2020-06-08T09:59:35Z

@bors r+

bors · 2020-06-08T09:59:36Z

📌 Commit 4cf2833 has been approved by nikomatsakis

Dylan-DPC-zz · 2020-06-12T00:25:48Z

@bors p=1

bors · 2020-06-12T10:18:58Z

⌛ Testing commit 4cf2833 with merge d73e24b4f387054673f9ca9fa3a9deb3d6b73ba4...

bors · 2020-06-12T13:10:51Z

💔 Test failed - checks-azure

Aaron1011 · 2020-06-20T07:15:02Z

My minimized example from #73335 no longer causes Rustdoc to OOM after #73452 was merged. This PR should now be unblocked.

jackh726 · 2020-06-20T07:38:30Z

@nikomatsakis care to r+ again?

Dylan-DPC-zz · 2020-06-20T11:12:09Z

@bors r=nikomatsakis

bors · 2020-06-20T11:12:10Z

📌 Commit d63195b has been approved by nikomatsakis

bors · 2020-06-21T17:10:14Z

⌛ Testing commit d63195b with merge a8cf399...

bors · 2020-06-21T21:05:50Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing a8cf399 to master...

nnethercote · 2020-06-23T00:06:52Z

This was a moderate perf win. Nice job!

jackh726 · 2020-06-23T03:05:44Z

@nnethercote that's really unexpected, since basically all of this code doesn't run unless you're in -Z chalk. The only thing I can imagine giving a perf win would be the rustc_hash bump.

rust-highfive assigned nikomatsakis Jun 3, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2020

nikomatsakis requested changes Jun 3, 2020

View reviewed changes

jackh726 force-pushed the chalk-more branch from b159507 to 1725fff Compare June 3, 2020 16:22

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 4, 2020

bors 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 Jun 6, 2020

jackh726 force-pushed the chalk-more branch from fc8e10d to 9a1f7f8 Compare June 7, 2020 19:12

jackh726 force-pushed the chalk-more branch 3 times, most recently from 6f44abe to 4cf2833 Compare June 8, 2020 03:25

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

bors 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 Jun 12, 2020

jackh726 added 13 commits June 19, 2020 14:04

Update chalk

6aa2e9d

Use builtin types for Never, Array, and FnDef

7c09ad0

Implement fn_def_datum

a42e5a1

Remove RustDefId

d0ad15d

Test error order is non-deterministic

e997375

Update Chalk

90e01ee

Update chalk and add LifetimeOutlives and ObjectSafe lowering

64c486b

Lower consts

6a979d8

Fix building

a1c769b

Update chalk to 0.11.0

b5d5994

Nits and change skip_binder to no_bound_vars for fndef

16ad3f3

Change InternedAdtDef to &'tcx AdtDef

890cef6

Return type is bound too

d63195b

jackh726 force-pushed the chalk-more branch from 4cf2833 to d63195b Compare June 19, 2020 18:09

Aaron1011 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 20, 2020

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 20, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2020

bors merged commit a8cf399 into rust-lang:master Jun 21, 2020

bors mentioned this pull request Jun 21, 2020

convert higher ranked Predicates to PredicateKind::ForAll #73503

Merged

jackh726 deleted the chalk-more branch June 21, 2020 22:28

Uh oh!

Conversation

jackh726 commented Jun 3, 2020

Uh oh!

nikomatsakis left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Jun 3, 2020

Uh oh!

jackh726 commented Jun 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nikomatsakis commented Jun 4, 2020

Uh oh!

bors commented Jun 4, 2020

Uh oh!

bors commented Jun 6, 2020

Uh oh!

jackh726 commented Jun 7, 2020

Uh oh!

Aaron1011 commented Jun 8, 2020

Uh oh!

jackh726 commented Jun 8, 2020

Uh oh!

nikomatsakis commented Jun 8, 2020

Uh oh!

bors commented Jun 8, 2020

Uh oh!

Dylan-DPC-zz commented Jun 12, 2020

Uh oh!

bors commented Jun 12, 2020

Uh oh!

bors commented Jun 12, 2020

Uh oh!

Aaron1011 commented Jun 20, 2020

Uh oh!

jackh726 commented Jun 20, 2020

Uh oh!

Dylan-DPC-zz commented Jun 20, 2020

Uh oh!

bors commented Jun 20, 2020

Uh oh!

bors commented Jun 21, 2020

Uh oh!

bors commented Jun 21, 2020

Uh oh!

nnethercote commented Jun 23, 2020

Uh oh!

jackh726 commented Jun 23, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

jackh726 commented Jun 3, 2020 •

edited

Loading