Auto merge of #70729 - nnethercote:a-big-options-clean-up, r=petrochenkov

author bors <bors@rust-lang.org>

Mon, 20 Apr 2020 12:30:45 +0000 (12:30 +0000)

committer bors <bors@rust-lang.org>

Mon, 20 Apr 2020 12:30:45 +0000 (12:30 +0000)
author bors <bors@rust-lang.org>
Mon, 20 Apr 2020 12:30:45 +0000 (12:30 +0000)
committer bors <bors@rust-lang.org>
Mon, 20 Apr 2020 12:30:45 +0000 (12:30 +0000)
diff --cc src/librustc_codegen_ssa/back/link.rs
Simple merge
diff --cc src/librustc_session/config.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 20 Apr 2020 12:30:45 +0000 (12:30 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 20 Apr 2020 12:30:45 +0000 (12:30 +0000)
		1	2
src/librustc_codegen_ssa/back/link.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_session/config.rs	patch \|	diff1 \|	diff2 \|	blob \| history