Rollup merge of #80799 - jyn514:pretty-print, r=CraftSpider

author Yuki Okushi <huyuumi.dev@gmail.com>

Fri, 8 Jan 2021 02:11:50 +0000 (11:11 +0900)

committer GitHub <noreply@github.com>

Fri, 8 Jan 2021 02:11:50 +0000 (11:11 +0900)
author Yuki Okushi <huyuumi.dev@gmail.com>
Fri, 8 Jan 2021 02:11:50 +0000 (11:11 +0900)
committer GitHub <noreply@github.com>
Fri, 8 Jan 2021 02:11:50 +0000 (11:11 +0900)
diff --cc src/librustdoc/clean/mod.rs
Simple merge
diff --cc src/librustdoc/clean/utils.rs
Simple merge
author	Yuki Okushi <huyuumi.dev@gmail.com>
	Fri, 8 Jan 2021 02:11:50 +0000 (11:11 +0900)
committer	GitHub <noreply@github.com>
	Fri, 8 Jan 2021 02:11:50 +0000 (11:11 +0900)
		1	2
src/librustdoc/clean/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustdoc/clean/utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history