diff options
| author | Eric Huss <eric@huss.org> | 2018-09-09 03:08:47 +0200 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2018-09-09 12:42:43 +0200 |
| commit | 60be0686e0c7135bf67d1df767cd2f792f2e94f4 (patch) | |
| tree | 3fca7fc1a2394a0339540226f7d08957f91fabcb | |
| parent | 3387f80ce39827dfa91c5559cc9999ec7737b035 (diff) | |
| download | rust-60be0686e0c7135bf67d1df767cd2f792f2e94f4.tar.gz rust-60be0686e0c7135bf67d1df767cd2f792f2e94f4.zip | |
merge cargo changes done by https://github.com/rust-lang/rust/pull/53935/
(done by matthiaskrgr, but I authored ehuss)
| -rw-r--r-- | src/Cargo.lock | 8 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 9828966fa95..989655ffb4f 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -172,13 +172,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cargo" -version = "0.30.0" +version = "0.31.0" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.18.0", + "crates-io 0.19.0", "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -452,7 +452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "crates-io" -version = "0.18.0" +version = "0.19.0" dependencies = [ "curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1753,7 +1753,7 @@ dependencies = [ name = "rls" version = "0.130.5" dependencies = [ - "cargo 0.30.0", + "cargo 0.31.0", "cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "clippy_lints 0.0.212", "crossbeam-channel 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index f762d9414cf..8e42c9c1ec7 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -237,6 +237,8 @@ impl Step for Cargo { // Don't run cross-compile tests, we may not have cross-compiled libstd libs // available. cargo.env("CFG_DISABLE_CROSS_TESTS", "1"); + // Disable a test that has issues with mingw. + cargo.env("CARGO_TEST_DISABLE_GIT_CLI", "1"); try_run( builder, |