diff options
| author | bors <bors@rust-lang.org> | 2017-07-26 14:08:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-26 14:08:50 +0000 |
| commit | 2fc3aec4316a76429a5a0c8d2eccb19bf81982d6 (patch) | |
| tree | c546d3fe0cccf7089fc5256222eb9cb44b4fa1af /src | |
| parent | bad58f27916e7e233cc2916dcc9167708077e792 (diff) | |
| parent | b23c83e0c2846cf9c0e00513bbb016015c7da1b9 (diff) | |
| download | rust-2fc3aec4316a76429a5a0c8d2eccb19bf81982d6.tar.gz rust-2fc3aec4316a76429a5a0c8d2eccb19bf81982d6.zip | |
Auto merge of #43485 - nrc:rls-env-fix, r=Mark-Simulacrum
Update RLS This pulls in https://github.com/rust-lang-nursery/rls/commit/79d659e5699fbf7db5b4819e9a442fb3f550472a It should fix #43453. It increases the timeout for test runs and forces builds in RLS tests to happen sequentially, this prevents interference between env vars passed to Cargo or rustc. r? @Mark-Simulacrum
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cargo.lock | 7 | ||||
| m--------- | src/tools/rls | 0 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 9ee9bdfd775..1df8bcf74cd 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1126,13 +1126,14 @@ dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 7.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "rls-analysis 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-nightly 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1582,7 +1583,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "0.1.9" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2219,7 +2220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff" "checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -"checksum rustfmt-nightly 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6693f90ac7d0a2291aa309f5214f5f3ac1bd79961c11116fcf6d5545749bf2e7" +"checksum rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa1ffc66e1e1786355f22e8a958a57bd67fbf9564f522f87f31de9586715f8f6" "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" "checksum scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59a076157c1e2dc561d8de585151ee6965d910dd4dcb5dabb7ae3e83981a6c57" diff --git a/src/tools/rls b/src/tools/rls -Subproject 7799d03de85bcc1a7437f65d4f7adfbb267d2ac +Subproject 79d659e5699fbf7db5b4819e9a442fb3f550472 |