Auto merge of #5281 - matklad:cleanup, r=alexcrichton

author bors <bors@rust-lang.org>

Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)

committer bors <bors@rust-lang.org>

Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
author bors <bors@rust-lang.org>
Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
committer bors <bors@rust-lang.org>
Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
diff --cc src/cargo/ops/cargo_rustc/fingerprint.rs
Simple merge
diff --cc src/cargo/ops/cargo_rustc/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
		1	2
src/cargo/ops/cargo_rustc/fingerprint.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/cargo/ops/cargo_rustc/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history