]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 500ddc5 50dde2e)
Auto merge of #77720 - matthewjasper:fix-trait-ices, r=nikomatsakis
authorbors <bors@rust-lang.org>
Thu, 22 Oct 2020 14:40:20 +0000 (14:40 +0000)
committerbors <bors@rust-lang.org>
Thu, 22 Oct 2020 14:40:20 +0000 (14:40 +0000)
commita9cd294cf2775441e713c7ee2918b728733b99f5
treee51c982b0fb305f639a6b5bd59c43a20c267a407tree | snapshot
parent500ddc5efda9d4b0c8f90b654d220ffc9e24ecb5commit | diff
parent50dde2e4d842a65f4c04bd8e27626ba6f1656849commit | diff
Auto merge of #77720 - matthewjasper:fix-trait-ices, r=nikomatsakis

Fix trait solving ICEs

- Selection candidates that are known to be applicable are preferred
  over candidates that are not.
- Don't ICE if a projection/object candidate is no longer applicable
  (this can happen due to cycles in normalization)
- Normalize supertraits when finding trait object candidates

Closes #77653
Closes #77656

r? `@nikomatsakis`
Empowering everyone to build reliable and efficient software.