Upgrade Chalk #80593

jackh726 · 2021-01-01T18:48:53Z

~~Blocked on rust-lang/chalk#670~~
~~Now blocked on rust-lang/chalk#680 and release~~

In addition to the straight upgrade, I also tried to fix some tests by properly returning variables and max universes in the solution. Unfortunately, this actually triggers the same perf problem that rustc traits code runs into in canonicalizer. Not sure what the root cause of this problem is, or why it's supposed to be solved in chalk.

r? @nikomatsakis

jackh726 · 2021-01-01T18:49:57Z

src/tools/tidy/src/extdeps.rs

@@ -27,7 +27,7 @@ pub fn check(root: &Path, bad: &mut bool) {

        // Ensure source is allowed.
        if !ALLOWED_SOURCES.contains(&&*source) {
-            tidy_error!(bad, "invalid source: {}", source);
+            //tidy_error!(bad, "invalid source: {}", source);


This was only needed so I can test locally with the git deps; I'll remove it when we have a real usable chalk version upstream.

did you to remove this before it lands?

Ugh whoops. Forgot about this. Will do that in a bit.`

jackh726 · 2021-01-01T18:50:22Z

I'll fix the merge conflict when this is no longer blocked.

JohnCSimon · 2021-01-19T05:45:22Z

@rustbot label: -S-waiting-on-review +S-waiting-on-author

jackh726 · 2021-01-19T07:24:09Z

@rustbot label: -S-waiting-on-author +S-blocked

This is waiting on Chalk.

rust-log-analyzer · 2021-01-31T06:10:51Z

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


######################################################################## 100.0%
extracting /checkout/obj/build/cache/2020-11-19/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
    Updating crates.io index
    Updating git repository `https://github.com/jackh726/chalk.git`
error: failed to get `chalk-ir` as a dependency of package `rustc_middle v0.0.0 (/checkout/compiler/rustc_middle)`
Caused by:
Caused by:
  failed to load source for dependency `chalk-ir`
Caused by:
Caused by:
  Unable to update https://github.com/jackh726/chalk.git?rev=984fea31e61bab06ec48155945d679731a6d6fec#984fea31
Caused by:
Caused by:
  object not found - no match for id (984fea31e61bab06ec48155945d679731a6d6fec); class=Odb (9); code=NotFound (-3)
Build completed unsuccessfully in 0:00:47

bors · 2021-02-01T05:42:07Z

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

jackh726 · 2021-02-01T08:31:08Z

welp, messed up submodules in rebase; will fix when chalk blockers are fixed

rust-log-analyzer · 2021-02-01T15:40:41Z

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


######################################################################## 100.0%
extracting /checkout/obj/build/cache/2020-11-19/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
    Updating crates.io index
    Updating git repository `https://github.com/jackh726/chalk.git`
error: failed to get `chalk-ir` as a dependency of package `rustc_middle v0.0.0 (/checkout/compiler/rustc_middle)`
Caused by:
Caused by:
  failed to load source for dependency `chalk-ir`
Caused by:
Caused by:
  Unable to update https://github.com/jackh726/chalk.git?rev=984fea31e61bab06ec48155945d679731a6d6fec#984fea31
Caused by:
Caused by:
  object not found - no match for id (984fea31e61bab06ec48155945d679731a6d6fec); class=Odb (9); code=NotFound (-3)
Build completed unsuccessfully in 0:00:42

rust-log-analyzer · 2021-02-01T15:45:33Z

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


######################################################################## 100.0%
extracting /checkout/obj/build/cache/2020-11-19/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz
    Updating crates.io index
    Updating git repository `https://github.com/jackh726/chalk.git`
error: failed to get `chalk-ir` as a dependency of package `rustc_middle v0.0.0 (/checkout/compiler/rustc_middle)`
Caused by:
Caused by:
  failed to load source for dependency `chalk-ir`
Caused by:
Caused by:
  Unable to update https://github.com/jackh726/chalk.git?rev=984fea31e61bab06ec48155945d679731a6d6fec#984fea31
Caused by:
Caused by:
  object not found - no match for id (984fea31e61bab06ec48155945d679731a6d6fec); class=Odb (9); code=NotFound (-3)
Build completed unsuccessfully in 0:00:39

nikomatsakis

r=me modulo the comment by @jackh726

nikomatsakis · 2021-02-02T15:37:38Z

@bors delegate+

bors · 2021-02-02T15:37:39Z

✌️ @jackh726 can now approve this pull request

nikomatsakis · 2021-02-02T15:38:21Z

@jackh726 feel free to r=nikomatsakis once you've resolved this comment

jackh726 · 2021-02-02T17:38:25Z

@bors r=nikomatsakis

bors · 2021-02-02T17:38:26Z

📋 Looks like this PR is still in progress, ignoring approval.

Hint: Remove [WIP] from this PR's title when it is ready for review.

jackh726 · 2021-02-02T17:38:52Z

@bors r=nikomatsakis

bors · 2021-02-02T17:38:53Z

📌 Commit a0622d6 has been approved by nikomatsakis

Upgrade Chalk ~~Blocked on rust-lang/chalk#670~~ ~~Now blocked on rust-lang/chalk#680 and release~~ In addition to the straight upgrade, I also tried to fix some tests by properly returning variables and max universes in the solution. Unfortunately, this actually triggers the same perf problem that rustc traits code runs into in `canonicalizer`. Not sure what the root cause of this problem is, or why it's supposed to be solved in chalk. r? `@nikomatsakis`

Upgrade Chalk ~~Blocked on rust-lang/chalk#670~~ ~~Now blocked on rust-lang/chalk#680 and release~~ In addition to the straight upgrade, I also tried to fix some tests by properly returning variables and max universes in the solution. Unfortunately, this actually triggers the same perf problem that rustc traits code runs into in `canonicalizer`. Not sure what the root cause of this problem is, or why it's supposed to be solved in chalk. r? ``@nikomatsakis``

Rollup of 14 pull requests Successful merges: - rust-lang#80593 (Upgrade Chalk) - rust-lang#81260 (Add .editorconfig) - rust-lang#81455 (Add AArch64 big-endian and ILP32 targets) - rust-lang#81517 (Remove remnants of the santizer runtime crates from bootstrap) - rust-lang#81530 (sys: use `process::abort()` instead of `arch::wasm32::unreachable()`) - rust-lang#81544 (Add better diagnostic for unbounded Abst. Const) - rust-lang#81588 (Add doc aliases for "delete") - rust-lang#81603 (rustbuild: Don't build compiler twice for error-index-generator.) - rust-lang#81634 (Add long explanation e0521) - rust-lang#81636 (Directly use `Option<&[T]>` instead of converting from `Option<&Vec<T>>` later on) - rust-lang#81647 (Fix bug with assert!() calling the wrong edition of panic!().) - rust-lang#81655 (Improve wording of suggestion about accessing field) - rust-lang#81665 (Fix out of date `Scalar` documentation) - rust-lang#81671 (Add more associated type tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned nikomatsakis Jan 1, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 1, 2021

jackh726 commented Jan 1, 2021

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 19, 2021

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 19, 2021

jackh726 force-pushed the chalk-upgrade branch from 31a48a2 to 537256c Compare January 31, 2021 06:08

Upgrade Chalk

4b64bc1

jackh726 force-pushed the chalk-upgrade branch from 537256c to 6bb6994 Compare February 1, 2021 15:38

jackh726 force-pushed the chalk-upgrade branch from 6bb6994 to 083e980 Compare February 1, 2021 15:42

jackh726 force-pushed the chalk-upgrade branch from 083e980 to cc0ec10 Compare February 1, 2021 23:41

jackh726 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 Feb 1, 2021

nikomatsakis approved these changes Feb 2, 2021

View reviewed changes

jackh726 force-pushed the chalk-upgrade branch from cc0ec10 to cdbf832 Compare February 2, 2021 17:32

Update Chalk

a0622d6

jackh726 force-pushed the chalk-upgrade branch from cdbf832 to a0622d6 Compare February 2, 2021 17:37

jackh726 changed the title ~~[WIP] Upgrade Chalk~~ Upgrade Chalk Feb 2, 2021

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 Feb 2, 2021

m-ou-se mentioned this pull request Feb 2, 2021

Rollup of 8 pull requests #81674

Closed

This was referenced Feb 2, 2021

Rollup of 14 pull requests #81677

Closed

Rollup of 14 pull requests #81678

Merged

bors merged commit c1623a2 into rust-lang:master Feb 3, 2021

rustbot added this to the 1.51.0 milestone Feb 3, 2021

jackh726 deleted the chalk-upgrade branch February 3, 2021 03:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade Chalk #80593

Upgrade Chalk #80593

jackh726 commented Jan 1, 2021 •

edited

Loading

jackh726 Jan 1, 2021

nikomatsakis Feb 2, 2021

jackh726 Feb 2, 2021

jackh726 commented Jan 1, 2021

JohnCSimon commented Jan 19, 2021

jackh726 commented Jan 19, 2021

rust-log-analyzer commented Jan 31, 2021

bors commented Feb 1, 2021

jackh726 commented Feb 1, 2021

rust-log-analyzer commented Feb 1, 2021

rust-log-analyzer commented Feb 1, 2021

nikomatsakis left a comment

nikomatsakis commented Feb 2, 2021

bors commented Feb 2, 2021

nikomatsakis commented Feb 2, 2021 •

edited

Loading

jackh726 commented Feb 2, 2021

bors commented Feb 2, 2021

jackh726 commented Feb 2, 2021

bors commented Feb 2, 2021

Upgrade Chalk #80593

Upgrade Chalk #80593

Conversation

jackh726 commented Jan 1, 2021 • edited Loading

jackh726 Jan 1, 2021

Choose a reason for hiding this comment

nikomatsakis Feb 2, 2021

Choose a reason for hiding this comment

jackh726 Feb 2, 2021

Choose a reason for hiding this comment

jackh726 commented Jan 1, 2021

JohnCSimon commented Jan 19, 2021

jackh726 commented Jan 19, 2021

rust-log-analyzer commented Jan 31, 2021

bors commented Feb 1, 2021

jackh726 commented Feb 1, 2021

rust-log-analyzer commented Feb 1, 2021

rust-log-analyzer commented Feb 1, 2021

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis commented Feb 2, 2021

bors commented Feb 2, 2021

nikomatsakis commented Feb 2, 2021 • edited Loading

jackh726 commented Feb 2, 2021

bors commented Feb 2, 2021

jackh726 commented Feb 2, 2021

bors commented Feb 2, 2021

jackh726 commented Jan 1, 2021 •

edited

Loading

nikomatsakis commented Feb 2, 2021 •

edited

Loading