Rollup of 4 pull requests#41305

Merged

bors merged 17 commits intorust-lang:masterfrom

frewsxcv:rollup

Apr 15, 2017

Commits on Apr 9, 2017

Fix rustdoc infinitely recursing when an external crate reexports itself
Aaron1011
committed

Commits on Apr 12, 2017

Fix invalid associated type rendering in rustdoc
GuillaumeGomez
committed