OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #45811 - DSpeckhals:update-rustfmt-rls, r=nikomatsakis 

tools: Fix rustfmt and the RLS

These tools have been corrected in their upstream repo's, and the submodules have been updated here to reflect that. I also had to update Cargo to match what the RLS is expecting.

The tool states for `rustfmt` and `rls` where both changed from "Broken" to "Testing" in this commit, thus enabling testing and distribution again.
This commit is contained in:
bors 2017-11-06 20:43:46 +00:00
parent dbe8055f5a d0c1f36771
commit bd0e45a323
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Cargo.lock generated
View File

@ -1447,7 +1447,7 @@ version = "0.1.0"
[[package]]
name = "rls"
version = "0.122.0"
version = "0.123.0"
dependencies = [
"cargo 0.24.0",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1456,12 +1456,12 @@ dependencies = [
"lazy_static 0.2.9 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-analysis 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-analysis 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-data 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-rustc 0.1.1 (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.2.13",
"rustfmt-nightly 0.2.14",
"serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1470,7 +1470,7 @@ dependencies = [
[[package]]
name = "rls-analysis"
version = "0.7.1"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"derive-new 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1946,7 +1946,7 @@ dependencies = [
[[package]]
name = "rustfmt-nightly"
version = "0.2.13"
version = "0.2.14"
dependencies = [
"diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2723,7 +2723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
"checksum rls-analysis 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3e4c03af262074324e732ba2313ce74968b4262b060367ed4d52940b6586fa1"
"checksum rls-analysis 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "10fbe17ed9da2fa3686ebb018958e194a4a25f0b3a78382bfe334d09d3c641f4"
"checksum rls-data 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48257ceade23c2e01a3ca8d2fc4226101b107f6a3c868f829cf3fd2f204a1fe6"
"checksum rls-rustc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b21ea952e9bf1569929abf1bb920262cde04b7b1b26d8e0260286302807299d2"
"checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a"

2
src/tools/cargo

@ -1 +1 @@
Subproject commit 859c2305b5d7ff820d7f7af158bbca999cbd8bf3
Subproject commit b83550edc300e3d80dd16d0440123ffc1ad77bb9

2
src/tools/rls

@ -1 +1 @@
Subproject commit 48fd42fe92175ce93a5b67f78c195254ee94493d
Subproject commit 9ad92e134ff56df52481cf19dc3da14b9e735061

2
src/tools/rustfmt

@ -1 +1 @@
Subproject commit cf0d494dda7447bacaab743a70c47e28bea55c6f
Subproject commit 51b03c3aaf5e69afbb7508e566c5da2bf0bc3662

4
src/tools/toolstate.toml
View File

@ -29,7 +29,7 @@ miri = "Broken"
clippy = "Broken"
# ping @nrc
rls = "Broken"
rls = "Testing"
# ping @nrc
rustfmt = "Broken"
rustfmt = "Testing"