Auto merge of #5281 - matklad:cleanup, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
committerbors <bors@rust-lang.org>
Mon, 2 Apr 2018 21:50:59 +0000 (21:50 +0000)
Cleanup

Hopefully the last round of `conext` refactoring :-)

r? @alexcrichton

1  2 
src/cargo/ops/cargo_rustc/fingerprint.rs
src/cargo/ops/cargo_rustc/mod.rs

Simple merge