Upgrade Chalk to 0.21 #75173
Upgrade Chalk to 0.21 #75173
Conversation
rust-highfive
added
the
S-waiting-on-review
|
☔ The latest upstream changes (presumably #75276) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@nikomatsakis gentle ping on this. I'll rebase after review, since there might be comments anyways. |
src/librustc_traits/chalk/db.rs
Outdated
| @@ -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 | |||
There was a problem hiding this comment.
Is this comment still relevant?
| _ => (), | ||
| }; | ||
|
|
||
| t.super_visit_with(self) |
There was a problem hiding this comment.
Can be moved to the wildcard match, I think? Same with visit_region
There was a problem hiding this comment.
Mmm no, because this returns bool
src/librustc_traits/chalk/mod.rs
Outdated
| })); | ||
|
|
||
| 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; |
There was a problem hiding this comment.
It's unused yes, but it's here as a reminder to use it eventually. I left a FIXME comment.
|
☔ The latest upstream changes (presumably #75120) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Rebased. |
|
@bors r+ |
|
📌 Commit 7052197d73247b40c9b1413f276ba792d9aeafd3 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 7052197d73247b40c9b1413f276ba792d9aeafd3 with merge 46195f03f1857ace1cbbe9bc877364b430a0c10b... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
Needs a rebase. Kind of expected this seeing the bors queue this morning. Let me do that. |
|
@bors delegate+ r+ |
|
✌️ @jackh726 can now approve this pull request |
|
📌 Commit fafdfaf has been approved by |
bors
added
S-waiting-on-bors
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
bors
added
S-waiting-on-author
|
Welp another rebase needed. |
|
@bors r=nikomatsakis |
|
📌 Commit 0aa2153 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions, checks-azure |
Two commits here. First commit actually does the upgrade. Second commit has some changes to make more tests in compare-mode=chalk pass.
The
PlaceholdersCollectorandRegionsSubstitutorbits are bit a hacky, but only insomuch asParamsSubstitutoris. These won't be needed eventually.r? @nikomatsakis