]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b638d8c a59584a)
Auto merge of #53580 - nikomatsakis:nll-issue-53568, r=pnkfelix
authorbors <bors@rust-lang.org>
Mon, 27 Aug 2018 14:44:13 +0000 (14:44 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Aug 2018 14:44:13 +0000 (14:44 +0000)
commit8785e348ba6b9d43ffd8ce4b1a59059cbce6334c
tree6f7716d4a72b185c9b8c28bebf7b4f354a79428btree | snapshot
parentb638d8c75f4e38c75c5caa52b10b18a350431687commit | diff
parenta59584a6ff381ad701e80723db743ed0771ddad8commit | diff
Auto merge of #53580 - nikomatsakis:nll-issue-53568, r=pnkfelix

fix NLL ICEs

Custom type-ops reuse some of the query machinery -- but while query results are canonicalized after they are constructed, custom type ops are not, and hence we have to resolve the type variables to avoid an ICE here.

Also, use the type-op machinery for implied outlives bounds.

Fixes #53568
Fixes #52992
Fixes #53680
src/librustc/infer/canonical/query_result.rs diff1 | diff2 | blob | history
src/librustc/traits/query/type_op/mod.rs diff1 | diff2 | blob | history
src/librustc_mir/borrow_check/nll/type_check/mod.rs diff1 | diff2 | blob | history
Empowering everyone to build reliable and efficient software.