Skip to content

Update rls-data for save analysis #45096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 26, 2017
Merged

Update rls-data for save analysis #45096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57d0410
Update rls-data for librustc-save-analysis
DSpeckhals Oct 7, 2017
dcb915e
Update rls submodule
DSpeckhals Oct 7, 2017
218103e
Update rustfmt along with rls
DSpeckhals Oct 11, 2017
69ba673
Use newest version of RLS and rustfmt
DSpeckhals Oct 20, 2017
bca47e4
Merge branch 'master' into update-rls-data-for-save-analysis
DSpeckhals Oct 24, 2017
aba409c
Update RLS with skip of failing test
DSpeckhals Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 14 additions & 42 deletions src/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 2 additions & 9 deletions src/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_save_analysis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions src/librustc_save_analysis/dump_visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
Open in desktop
Submodule rls updated from 93b47d to e03485
2 changes: 1 addition & 1 deletion src/tools/rustfmt
Open in desktop
Submodule rustfmt updated from 16a478 to 9754bc