Skip to content

No environment in Constraints - #680

Merged
bors merged 1 commit into
rust-lang:masterfrom
jackh726:chalk-fix
Feb 1, 2021
Merged

No environment in Constraints#680
bors merged 1 commit into
rust-lang:masterfrom
jackh726:chalk-fix

Conversation

@jackh726

Copy link
Copy Markdown
Member

Should have been included in #671. Oops.

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 1, 2021

Copy link
Copy Markdown
Contributor

📌 Commit 10d6b11 has been approved by nikomatsakis

@bors

bors commented Feb 1, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit 10d6b11 with merge 0e50bae...

@bors

bors commented Feb 1, 2021

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 0e50bae to master...

@bors
bors merged commit 0e50bae into rust-lang:master Feb 1, 2021
@jackh726
jackh726 deleted the chalk-fix branch February 1, 2021 15:24
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 2, 2021
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`
jackh726 added a commit to jackh726/rust that referenced this pull request Feb 2, 2021
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``
jackh726 added a commit to jackh726/rust that referenced this pull request Feb 2, 2021
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```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants