Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No environment in Constraints #680

Merged
merged 1 commit into from
Feb 1, 2021
Merged

No environment in Constraints #680

merged 1 commit into from
Feb 1, 2021

Conversation

jackh726
Copy link
Member

Should have been included in #671. Oops.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 1, 2021

📌 Commit 10d6b11 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Feb 1, 2021

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

@bors
Copy link
Collaborator

bors commented Feb 1, 2021

☀️ 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