Upgrade Chalk to 0.21 #75173

jackh726 · 2020-08-05T02:37:38Z

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

bors · 2020-08-08T06:23:04Z

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

jackh726 · 2020-08-13T17:12:27Z

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

src/librustc_middle/traits/chalk.rs

src/librustc_traits/chalk/db.rs

detrumi · 2020-08-14T11:04:32Z

src/librustc_traits/chalk/db.rs

@@ -54,11 +77,7 @@ impl<'tcx> chalk_solve::RustIrDatabase<RustInterner<'tcx>> for RustIrDatabase<'t
        // FIXME(chalk): this really isn't right I don't think. The functions


Is this comment still relevant?

src/librustc_traits/chalk/db.rs

src/librustc_traits/chalk/lowering.rs

detrumi · 2020-08-14T12:25:25Z

src/librustc_traits/chalk/lowering.rs

+            _ => (),
+        };
+
+        t.super_visit_with(self)


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

Mmm no, because this returns bool

detrumi · 2020-08-14T12:28:20Z

src/librustc_traits/chalk/mod.rs

+    }));
+
+    let mut params_substitutor =
+        ParamsSubstitutor::new(tcx, placeholders_collector.next_ty_placehoder);
    let obligation = obligation.fold_with(&mut params_substitutor);
    let _params: FxHashMap<usize, ParamTy> = params_substitutor.params;


I think this can be removed?

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

src/librustc_traits/chalk/mod.rs

bors · 2020-08-18T01:28:05Z

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

nikomatsakis

r=me when rebased!

jackh726 · 2020-09-02T23:14:07Z

Rebased.

nikomatsakis · 2020-09-03T17:03:42Z

@bors r+

bors · 2020-09-03T17:03:44Z

📌 Commit 7052197d73247b40c9b1413f276ba792d9aeafd3 has been approved by nikomatsakis

bors · 2020-09-04T03:48:14Z

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

bors · 2020-09-04T04:12:53Z

💔 Test failed - checks-actions

jackh726 · 2020-09-04T04:36:32Z

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

nikomatsakis · 2020-09-04T15:22:37Z

@bors delegate+ r+

bors · 2020-09-04T15:22:39Z

✌️ @jackh726 can now approve this pull request

bors · 2020-09-04T15:22:40Z

📌 Commit fafdfaf has been approved by nikomatsakis

@nikomatsakis

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-zz · 2020-09-04T23:10:52Z

failed in rollup

@bors r-

jackh726 · 2020-09-04T23:11:51Z

Welp another rebase needed.

jackh726 · 2020-09-05T00:18:36Z

@bors r=nikomatsakis

bors · 2020-09-05T00:18:38Z

📌 Commit 0aa2153 has been approved by nikomatsakis

bors · 2020-09-05T02:24:11Z

⌛ Testing commit 0aa2153 with merge c336478...

bors · 2020-09-05T04:15:30Z

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

rust-highfive assigned nikomatsakis Aug 5, 2020

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

jackh726 force-pushed the chalk-0.21 branch from 44f2ece to 85e6201 Compare August 5, 2020 03:34

jackh726 closed this Aug 5, 2020

jackh726 reopened this Aug 5, 2020

vandenheuvel mentioned this pull request Aug 13, 2020

Update chalk to 0.19.0 #74700

Closed

detrumi reviewed Aug 14, 2020

View reviewed changes

jackh726 force-pushed the chalk-0.21 branch from 85e6201 to 2fd14de Compare August 16, 2020 04:18

nikomatsakis approved these changes Sep 2, 2020

View reviewed changes

jackh726 force-pushed the chalk-0.21 branch from 2fd14de to 7052197 Compare September 2, 2020 23:13

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

jackh726 force-pushed the chalk-0.21 branch from 7052197 to fafdfaf Compare September 4, 2020 05:52

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

Dylan-DPC-zz mentioned this pull request Sep 4, 2020

Rollup of 14 pull requests #76348

Closed

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

jackh726 added 5 commits September 4, 2020 19:12

Upgrade chalk to 0.21

d66452c

More chalk work

76c7289

Review comments

f690569

Bless changed test output

3a9a4e8

kind -> kind()

0aa2153

jackh726 force-pushed the chalk-0.21 branch from fafdfaf to 0aa2153 Compare September 4, 2020 23:18

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 Sep 5, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 5, 2020

bors merged commit c336478 into rust-lang:master Sep 5, 2020

rustbot added this to the 1.48.0 milestone Sep 5, 2020

This was referenced Sep 5, 2020

Refactor byteorder to std in rustc_middle #75741

Merged

Removing the def_id field from hot ParamEnv to make it smaller #76244

Merged

Rollup of 13 pull requests #76350

Closed

jackh726 deleted the chalk-0.21 branch September 5, 2020 07:45

		@@ -54,11 +77,7 @@ impl<'tcx> chalk_solve::RustIrDatabase<RustInterner<'tcx>> for RustIrDatabase<'t
		// FIXME(chalk): this really isn't right I don't think. The functions

Upgrade Chalk to 0.21 #75173

Upgrade Chalk to 0.21 #75173

Uh oh!

Conversation

jackh726 commented Aug 5, 2020

Uh oh!

bors commented Aug 8, 2020

Uh oh!

jackh726 commented Aug 13, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

detrumi Aug 14, 2020

Choose a reason for hiding this comment

Uh oh!

jackh726 Aug 16, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

detrumi Aug 14, 2020

Choose a reason for hiding this comment

Uh oh!

jackh726 Aug 16, 2020

Choose a reason for hiding this comment

Uh oh!

detrumi Aug 14, 2020

Choose a reason for hiding this comment

Uh oh!

jackh726 Aug 16, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bors commented Aug 18, 2020

Uh oh!

nikomatsakis left a comment

Choose a reason for hiding this comment

Uh oh!

jackh726 commented Sep 2, 2020

Uh oh!

nikomatsakis commented Sep 3, 2020

Uh oh!

bors commented Sep 3, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

jackh726 commented Sep 4, 2020

Uh oh!

nikomatsakis commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

Dylan-DPC-zz commented Sep 4, 2020

Uh oh!

jackh726 commented Sep 4, 2020

Uh oh!

jackh726 commented Sep 5, 2020

Uh oh!

bors commented Sep 5, 2020

Uh oh!

bors commented Sep 5, 2020

Uh oh!

bors commented Sep 5, 2020

Uh oh!

Uh oh!