squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

merge cargo changes done by https://github.com/rust-lang/rust/pull/53935/

Browse source 
(done by matthiaskrgr, but I authored ehuss)
This commit is contained in:
Eric Huss 2018-09-09 03:08:47 +02:00 committed by Matthias Krüger
parent 3387f80ce3
commit 60be0686e0
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Cargo.lock
View file

@ -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)",

2
src/bootstrap/test.rs
View file

@ -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,