Auto merge of #51732 - GuillaumeGomez:cmd-line-lint-rustdoc, r=QuietMisdreavus

author bors <bors@rust-lang.org>

Thu, 5 Jul 2018 22:28:53 +0000 (22:28 +0000)

committer bors <bors@rust-lang.org>

Thu, 5 Jul 2018 22:28:53 +0000 (22:28 +0000)
author bors <bors@rust-lang.org>
Thu, 5 Jul 2018 22:28:53 +0000 (22:28 +0000)
committer bors <bors@rust-lang.org>
Thu, 5 Jul 2018 22:28:53 +0000 (22:28 +0000)
diff --cc src/librustc/session/config.rs
Simple merge
diff --cc src/librustdoc/core.rs
Simple merge
diff --cc src/librustdoc/lib.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 5 Jul 2018 22:28:53 +0000 (22:28 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 5 Jul 2018 22:28:53 +0000 (22:28 +0000)
		1	2
src/librustc/session/config.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustdoc/core.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustdoc/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history