]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4c1f0c 9fc2595)
Auto merge of #50271 - sinkuu:fix_ice, r=eddyb
authorbors <bors@rust-lang.org>
Sun, 29 Apr 2018 03:01:09 +0000 (03:01 +0000)
committerbors <bors@rust-lang.org>
Sun, 29 Apr 2018 03:01:09 +0000 (03:01 +0000)
Fix ICE #48984

* ~~fbf6423  The tail type was not normalized.~~
* https://github.com/rust-lang/rust/commit/d0839d5680d2a51785eeb0811cf3e2beba90eacb  The method had a wrong assumption that something whose parent is a trait is an associated item. Fixes #48984.

1  2 
src/librustc_metadata/decoder.rs patch | diff1 | diff2 | blob | history

diff --cc src/librustc_metadata/decoder.rs
Simple merge
Empowering everyone to build reliable and efficient software.