about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2021-02-09 02:39:50 +0100
committerGitHub <noreply@github.com>2021-02-09 02:39:50 +0100
commit44e526b2c38c81c732dd3e640f3cc06acc8f69bb (patch)
tree3c953a9ef9e6eb532224fe1c7107e1c642fff27b /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
parentf8b330d9fb114132fb41eccdafbe29b48d386749 (diff)
parent8d17c6a85d6530d446d1cb42ee6636c5c9fbfaaf (diff)
downloadrust-44e526b2c38c81c732dd3e640f3cc06acc8f69bb.tar.gz
rust-44e526b2c38c81c732dd3e640f3cc06acc8f69bb.zip
Rollup merge of #80732 - spastorino:trait-inheritance-self2, r=nikomatsakis
Allow Trait inheritance with cycles on associated types take 2

This reverts the revert of #79209 and fixes the ICEs that's occasioned by that PR exposing some problems that are addressed in #80648 and #79811.
For easier review I'd say, check only the last commit, the first one is just a revert of the revert of #79209 which was already approved.

This also could be considered part or the actual fix of #79560 but I guess for that to be closed and fixed completely we would need to land #80648 and #79811 too.

r? `@nikomatsakis`
cc `@Aaron1011`
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions