diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-06-21 10:40:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 10:40:17 -0400 |
| commit | 80e14a0fe309e898e22fe9016a6e04dd16ba5f23 (patch) | |
| tree | 609bd277e2bd4d9d8e81940942c4b82604ca126c | |
| parent | 30a7bfcaae402980a529233cd8d5588c226b66d9 (diff) | |
| parent | f2340a01461f9d6f9a6593d5290f1fc68f5139f1 (diff) | |
| download | rust-80e14a0fe309e898e22fe9016a6e04dd16ba5f23.tar.gz rust-80e14a0fe309e898e22fe9016a6e04dd16ba5f23.zip | |
Rollup merge of #42766 - nrc:versions, r=nagisa
Update rls-data version And update the RLS submod
| -rw-r--r-- | src/Cargo.lock | 6 | ||||
| -rw-r--r-- | src/librustc_save_analysis/Cargo.toml | 2 | ||||
| m--------- | src/tools/rls | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 6d7fcb71efa..fcc30c007ea 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "rls-data" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1381,7 +1381,7 @@ name = "rustc_save_analysis" version = "0.0.0" dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rls-data 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc 0.0.0", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2101,7 +2101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db" "checksum rls-analysis 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d77d58e8933752142b5b92e3f8ba6d6f1630be6da5627c492268a43f79ffbda" "checksum rls-data 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "374a8fad31cc0681a7bfd8a04079dd4afd0e981d34e18a171b1a467445bdf51e" -"checksum rls-data 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e2087477364c34faca86c2476765deb1185dbae3c598cfb1eb040f3a74d22b5" +"checksum rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e502ac679bc35e023e982506c32d0278ef89e29af1e4ad21cb70c44b525b87a9" "checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a" "checksum rls-vfs 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ace07060dd154731b39254864245cbdd33c8f5f64fe1f630a089c72e2468f854" "checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95" diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml index 53a82cf73e9..1ae666fbc2f 100644 --- a/src/librustc_save_analysis/Cargo.toml +++ b/src/librustc_save_analysis/Cargo.toml @@ -14,7 +14,7 @@ rustc = { path = "../librustc" } rustc_typeck = { path = "../librustc_typeck" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } -rls-data = "0.6" +rls-data = "0.7" rls-span = "0.4" # FIXME(#40527) should move rustc serialize out of tree rustc-serialize = "0.3" diff --git a/src/tools/rls b/src/tools/rls -Subproject e53e2f8d5b7f7751dd478fff68c1dbe7247cb09 +Subproject d26fd6f089a4e7f1216a03a6d604bee33b2301d |