diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2017-05-30 12:01:48 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2017-06-12 14:14:23 +1200 |
| commit | 0058fdd110bd98a8e3e8b487247bef5f4e6cb618 (patch) | |
| tree | 5b9a4e7f6b222c4dbedc321ea9ed342c3a2fe976 /src | |
| parent | 600237fa1962027e281383709691475d44e048aa (diff) | |
| download | rust-0058fdd110bd98a8e3e8b487247bef5f4e6cb618.tar.gz rust-0058fdd110bd98a8e3e8b487247bef5f4e6cb618.zip | |
Update rls-data
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cargo.lock | 6 | ||||
| -rw-r--r-- | src/librustc_save_analysis/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustc_save_analysis/json_dumper.rs | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 8bf4b6ad3e0..7718dff3b83 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1049,7 +1049,7 @@ dependencies = [ [[package]] name = "rls-data" -version = "0.4.1" +version = "0.6.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)", @@ -1372,7 +1372,7 @@ name = "rustc_save_analysis" version = "0.0.0" dependencies = [ "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "rls-data 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rls-data 0.6.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)", @@ -2077,7 +2077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457" "checksum rls-analysis 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d77d58e8933752142b5b92e3f8ba6d6f1630be6da5627c492268a43f79ffbda" "checksum rls-data 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc4277ce3c57f456b11fe3145b181a844a25201bab5cbaa1978457e6e2f27d47" -"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-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 6d04bff8282..53a82cf73e9 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.3" +rls-data = "0.6" rls-span = "0.4" # FIXME(#40527) should move rustc serialize out of tree rustc-serialize = "0.3" diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs index eaa0c0825f0..a315cca9f4d 100644 --- a/src/librustc_save_analysis/json_dumper.rs +++ b/src/librustc_save_analysis/json_dumper.rs @@ -484,10 +484,7 @@ impl Into<Relation> for InheritanceData { impl Into<Signature> for external_data::Signature { fn into(self) -> Signature { Signature { - span: self.span, text: self.text, - ident_start: self.ident_start, - ident_end: self.ident_end, defs: self.defs.into_iter().map(|s| s.into()).collect(), refs: self.refs.into_iter().map(|s| s.into()).collect(), } |