Rollup of 7 pull requests#42738

Merged

bors merged 14 commits into

rust-lang:masterfrom

Mark-Simulacrum:rollup

Jun 18, 2017

Commits on Jun 16, 2017

Use custom cargo/rustc paths when parsing flags.
Mark-Simulacrum
committed

Commits on Jun 17, 2017

Commits on Jun 18, 2017