Merge remote-tracking branch 'upstream/master' into pr4988
authorXimin Luo <infinity0@pwned.gg>
Sat, 3 Mar 2018 11:56:08 +0000 (12:56 +0100)
committerXimin Luo <infinity0@pwned.gg>
Sat, 3 Mar 2018 11:56:08 +0000 (12:56 +0100)
commit9c5eecd41900686a1fee27a3f6ebd6eecfa14e36
treea91b601bdb3565c0120789083696c5f3b818c3f2
parentda41b4e0391f23d282981e8d0f2c700b3fe4972d
parent4429f4efa12dc62985d971fa3ea16e50f541e35a
Merge remote-tracking branch 'upstream/master' into pr4988
src/bin/build.rs
src/cargo/core/features.rs
src/cargo/core/resolver/mod.rs
src/cargo/core/workspace.rs
src/cargo/ops/cargo_compile.rs
src/cargo/ops/cargo_install.rs
src/cargo/ops/resolve.rs
tests/testsuite/build.rs
tests/testsuite/install.rs