Auto merge of #45096 - DSpeckhals:update-rls-data-for-save-analysis, r=alexcrichton

Update rls-data for save analysis

rls-data: 0.10 -> 0.11

This will allow for more fine-grained save analysis for enum variants (tuple and struct).

The first commit updates rls-data, and makes the changes to dump_visitor. The second commit updates the rls submodule, and removes "members" that were deleted from that update in src/Cargo.toml.

Note, that when building the project, rustfmt-nightly was updated in Cargo.lock. If these changes should be excluded, I can revert it.

cc/ @nrc

Author: bors

src/Cargo.lock

@@ -22,24 +22,17 @@ members = [
   "tools/rustfmt",
   # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
   "tools/rls/test_data/borrow_error",
-  "tools/rls/test_data/completion",
-  "tools/rls/test_data/find_all_refs",
+  "tools/rls/test_data/common",
+  "tools/rls/test_data/features",
   "tools/rls/test_data/find_all_refs_no_cfg_test",
-  "tools/rls/test_data/goto_def",
-  "tools/rls/test_data/highlight",
-  "tools/rls/test_data/hover",
-  "tools/rls/test_data/rename",
   "tools/rls/test_data/reformat",
-  "tools/rls/test_data/bin_lib_no_cfg_test",
   "tools/rls/test_data/multiple_bins",
   "tools/rls/test_data/bin_lib",
   "tools/rls/test_data/reformat_with_range",
   "tools/rls/test_data/find_impls",
   "tools/rls/test_data/infer_bin",
   "tools/rls/test_data/infer_custom_bin",
   "tools/rls/test_data/infer_lib",
-  "tools/rls/test_data/omit_init_build",
-  "tools/rls/test_data/unicødë",
   "tools/rls/test_data/workspace_symbol",
 ]
 

src/Cargo.toml

@@ -15,7 +15,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_typeck = { path = "../librustc_typeck" }
 syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
-rls-data = "0.10"
+rls-data = "0.11"
 rls-span = "0.4"
 # FIXME(#40527) should move rustc serialize out of tree
 rustc-serialize = "0.3"

src/librustc_save_analysis/Cargo.toml

@@ -611,7 +611,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
                         let parent = Some(::id_from_node_id(item.id, &self.save_ctxt));
 
                         self.dumper.dump_def(item.vis == ast::Visibility::Public, Def {
-                            kind: DefKind::Struct,
+                            kind: DefKind::StructVariant,
                             id,
                             span,
                             name,
@@ -645,7 +645,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
                         let parent = Some(::id_from_node_id(item.id, &self.save_ctxt));
 
                         self.dumper.dump_def(item.vis == ast::Visibility::Public, Def {
-                            kind: DefKind::Tuple,
+                            kind: DefKind::TupleVariant,
                             id,
                             span,
                             name,