Skip to content

Commit 8c1699d

Browse files
committed
Update rls-data dep
1 parent 4e6c1dd commit 8c1699d

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

src/Cargo.lock

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/librustc_save_analysis/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
1515
rustc_typeck = { path = "../librustc_typeck" }
1616
syntax = { path = "../libsyntax" }
1717
syntax_pos = { path = "../libsyntax_pos" }
18-
rls-data = "0.9"
18+
rls-data = "0.10"
1919
rls-span = "0.4"
2020
# FIXME(#40527) should move rustc serialize out of tree
2121
rustc-serialize = "0.3"

src/librustc_save_analysis/json_dumper.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ impl<'b> DumpOutput for CallbackOutput<'b> {
5151

5252
impl<'b, W: Write> JsonDumper<WriteOutput<'b, W>> {
5353
pub fn new(writer: &'b mut W, config: Config) -> JsonDumper<WriteOutput<'b, W>> {
54-
JsonDumper { output: WriteOutput { output: writer }, config, result: Analysis::new() }
54+
JsonDumper {
55+
output: WriteOutput { output: writer },
56+
config: config.clone(),
57+
result: Analysis::new(config)
58+
}
5559
}
5660
}
5761

@@ -61,8 +65,8 @@ impl<'b> JsonDumper<CallbackOutput<'b>> {
6165
-> JsonDumper<CallbackOutput<'b>> {
6266
JsonDumper {
6367
output: CallbackOutput { callback: callback },
64-
config,
65-
result: Analysis::new(),
68+
config: config.clone(),
69+
result: Analysis::new(config),
6670
}
6771
}
6872
}

0 commit comments

Comments
 (0)