rollup merge of #17226 : P1start/rustdoc-colour

diff --cc src/librustc/middle/resolve.rs
Simple merge

diff --cc src/librustc/middle/typeck/astconv.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge

diff --cc src/librustdoc/html/static/main.js
Simple merge