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

Update Chalk to 0.36.0 #78502

Merged
merged 4 commits into from
Nov 10, 2020
Merged

Update Chalk to 0.36.0 #78502

merged 4 commits into from
Nov 10, 2020

Conversation

matthewjasper
Copy link
Contributor

This PR updates Chalk and fixes a number of bugs in the chalk integration code.

cc @rust-lang/wg-traits
r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 28, 2020
Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM to me! I had one question and one nit-ish comment (preexisting).

compiler/rustc_traits/src/chalk/db.rs Show resolved Hide resolved
compiler/rustc_traits/src/chalk/lowering.rs Outdated Show resolved Hide resolved
compiler/rustc_traits/src/chalk/lowering.rs Show resolved Hide resolved
src/test/ui/chalkify/trait-objects.rs Show resolved Hide resolved
@jackh726
Copy link
Member

Oh, there was a test failure

bors added a commit to rust-lang/chalk that referenced this pull request Oct 29, 2020
Replace bound lifetime variables with inference variables in AntiUnifier

This fixes an issue that caused an ICE in rust-lang/rust#78502

r? `@jackh726`
@matthewjasper matthewjasper changed the title Update Chalk to 0.35.0 Update Chalk to 0.36.0 Oct 29, 2020
@bors

This comment has been minimized.

- Add more well-known traits
- Use the correct binders when lowering trait objects
- Use correct substs when lowering trait objects
- Use the correct binders for opaque_ty_data
- Lower negative impls with the correct polarity
- Supply associated type values
- Use `predicates_defined_on` for where clauses
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 6, 2020

📌 Commit 4d60a80 has been approved by nikomatsakis

@bors 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 Nov 6, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2020
Rollup of 12 pull requests

Successful merges:

 - rust-lang#74754 (Add `#[cfg(panic = '...')]`)
 - rust-lang#76468 (Improve lifetime name annotations for closures & async functions)
 - rust-lang#77016 (Test clippy on PR CI on changes)
 - rust-lang#78480 (BTreeMap: fix pointer provenance rules)
 - rust-lang#78502 (Update Chalk to 0.36.0)
 - rust-lang#78513 (Infer the default host target from the host toolchain if possible)
 - rust-lang#78566 (Enable LLVM Polly via llvm-args.)
 - rust-lang#78580 (inliner: Break inlining cycles)
 - rust-lang#78710 (rustc_ast: Do not panic by default when visiting macro calls)
 - rust-lang#78746 (Demote i686-unknown-freebsd to tier 2 compiler target)
 - rust-lang#78830 (fix `super_visit_with` for `Terminator`)
 - rust-lang#78844 (Monomorphize a type argument of size-of operation during codegen)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0aed74a into rust-lang:master Nov 10, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 10, 2020
@matthewjasper matthewjasper deleted the chalkup branch November 10, 2020 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants