]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25225 - bluss:doc-search-assoc-items, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 11 May 2015 20:02:18 +0000 (20:02 +0000)
committerbors <bors@rust-lang.org>
Mon, 11 May 2015 20:02:18 +0000 (20:02 +0000)
Rustdoc fixes for associated items

This is related to isssue #22442 and solves it partly.

This solves the search index links of associated types and constants,
so that they link to the trait page.

Also add an Associated Constants section if constants are present.

1  2 
src/librustdoc/html/render.rs
src/librustdoc/html/static/main.js

Simple merge
Simple merge