Skip to content

Commit 24123dd

Browse files
committed
Minimize final diff
1 parent 1e593be commit 24123dd

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

Diff for: src/librustc_save_analysis/dump_visitor.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ use json_dumper::{Access, DumpOutput, JsonDumper};
5151
use span_utils::SpanUtils;
5252
use sig;
5353

54-
use rls_data::{
55-
CompilationOptions, CratePreludeData, Def, DefKind, GlobalCrateId, Import, ImportKind, Ref,
56-
RefKind, Relation, RelationKind, SpanData,
57-
};
54+
use rls_data::{CompilationOptions, CratePreludeData, Def, DefKind, GlobalCrateId, Import,
55+
ImportKind, Ref, RefKind, Relation, RelationKind, SpanData};
5856

5957
macro_rules! down_cast_data {
6058
($id:ident, $kind:ident, $sp:expr) => {

Diff for: src/librustc_save_analysis/json_dumper.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ use std::io::Write;
1313
use rustc_serialize::json::as_json;
1414

1515
use rls_data::config::Config;
16-
use rls_data::{
17-
self, Analysis, CompilationOptions, CratePreludeData, Def, DefKind, Impl, Import, MacroRef,
18-
Ref, RefKind, Relation,
19-
};
16+
use rls_data::{self, Analysis, CompilationOptions, CratePreludeData, Def, DefKind, Impl, Import,
17+
MacroRef, Ref, RefKind, Relation};
2018
use rls_span::{Column, Row};
2119

2220
#[derive(Debug)]

Diff for: src/librustc_save_analysis/lib.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,10 @@ use json_dumper::JsonDumper;
7272
use dump_visitor::DumpVisitor;
7373
use span_utils::SpanUtils;
7474

75+
use rls_data::{Def, DefKind, ExternalCrateData, GlobalCrateId, MacroRef, Ref, RefKind, Relation,
76+
RelationKind, SpanData, Impl, ImplKind};
7577
use rls_data::config::Config;
76-
use rls_data::{
77-
Def, DefKind, ExternalCrateData, GlobalCrateId, Impl, ImplKind, MacroRef, Ref,
78-
RefKind, Relation, RelationKind, SpanData,
79-
};
78+
8079

8180
pub struct SaveContext<'l, 'tcx: 'l> {
8281
tcx: TyCtxt<'l, 'tcx, 'tcx>,
@@ -144,7 +143,6 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
144143
}
145144
};
146145
let lo_loc = self.span_utils.sess.source_map().lookup_char_pos(span.lo());
147-
148146
result.push(ExternalCrateData {
149147
// FIXME: change file_name field to PathBuf in rls-data
150148
// https://github.com/nrc/rls-data/issues/7

0 commit comments

Comments
 (0)