Skip to content

Commit 7ca2b94

Browse files
nrcnrc
committed
Review changes and satisfy make tidy
1 parent f7652bf commit 7ca2b94

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

‎src/librustc_save_analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ crate-type = ["dylib"]
1212
log = { path = "../liblog" }
1313
rustc = { path = "../librustc" }
1414
syntax = { path = "../libsyntax" }
15-
serialize = { path = "../librustc_serialize" }
15+
serialize = { path = "../libserialize" }

‎src/librustc_save_analysis/dump.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@
1111
use super::data::*;
1212

1313
pub trait Dump {
14-
fn crate_prelude(&mut self, CratePreludeData);
15-
fn enum_data(&mut self, EnumData);
16-
fn extern_crate(&mut self, ExternCrateData);
17-
fn impl_data(&mut self, ImplData);
18-
fn inheritance(&mut self, InheritanceData);
19-
fn function(&mut self, FunctionData);
20-
fn function_ref(&mut self, FunctionRefData);
21-
fn function_call(&mut self, FunctionCallData);
22-
fn method(&mut self, MethodData);
23-
fn method_call(&mut self, MethodCallData);
24-
fn macro_data(&mut self, MacroData);
25-
fn macro_use(&mut self, MacroUseData);
26-
fn mod_data(&mut self, ModData);
27-
fn mod_ref(&mut self, ModRefData);
28-
fn struct_data(&mut self, StructData);
29-
fn struct_variant(&mut self, StructVariantData);
30-
fn trait_data(&mut self, TraitData);
31-
fn tuple_variant(&mut self, TupleVariantData);
32-
fn type_ref(&mut self, TypeRefData);
33-
fn typedef(&mut self, TypedefData);
34-
fn use_data(&mut self, UseData);
35-
fn use_glob(&mut self, UseGlobData);
36-
fn variable(&mut self, VariableData);
37-
fn variable_ref(&mut self, VariableRefData);
14+
fn crate_prelude(&mut self, CratePreludeData) {}
15+
fn enum_data(&mut self, EnumData) {}
16+
fn extern_crate(&mut self, ExternCrateData) {}
17+
fn impl_data(&mut self, ImplData) {}
18+
fn inheritance(&mut self, InheritanceData) {}
19+
fn function(&mut self, FunctionData) {}
20+
fn function_ref(&mut self, FunctionRefData) {}
21+
fn function_call(&mut self, FunctionCallData) {}
22+
fn method(&mut self, MethodData) {}
23+
fn method_call(&mut self, MethodCallData) {}
24+
fn macro_data(&mut self, MacroData) {}
25+
fn macro_use(&mut self, MacroUseData) {}
26+
fn mod_data(&mut self, ModData) {}
27+
fn mod_ref(&mut self, ModRefData) {}
28+
fn struct_data(&mut self, StructData) {}
29+
fn struct_variant(&mut self, StructVariantData) {}
30+
fn trait_data(&mut self, TraitData) {}
31+
fn tuple_variant(&mut self, TupleVariantData) {}
32+
fn type_ref(&mut self, TypeRefData) {}
33+
fn typedef(&mut self, TypedefData) {}
34+
fn use_data(&mut self, UseData) {}
35+
fn use_glob(&mut self, UseGlobData) {}
36+
fn variable(&mut self, VariableData) {}
37+
fn variable_ref(&mut self, VariableRefData) {}
3838
}

‎src/librustc_save_analysis/json_dumper.rs

+25-25
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<'a, 'b, W: Write> JsonDumper<'a, 'b, W> {
2828
pub fn new(writer: &'b mut W, codemap: &'a CodeMap) -> JsonDumper<'a, 'b, W> {
2929
if let Err(_) = write!(writer, "[") {
3030
error!("Error writing output");
31-
}
31+
}
3232
JsonDumper { output: writer, codemap:codemap, first: true }
3333
}
3434
}
@@ -109,7 +109,7 @@ impl Lower for data::CratePreludeData {
109109
crate_name: self.crate_name,
110110
crate_root: self.crate_root,
111111
external_crates: self.external_crates,
112-
span: SpanData::from_span(self.span, cm),
112+
span: SpanData::from_span(self.span, cm),
113113
}
114114
}
115115
}
@@ -132,7 +132,7 @@ impl Lower for data::EnumData {
132132
id: self.id,
133133
value: self.value,
134134
qualname: self.qualname,
135-
span: SpanData::from_span(self.span, cm),
135+
span: SpanData::from_span(self.span, cm),
136136
scope: self.scope,
137137
}
138138
}
@@ -158,7 +158,7 @@ impl Lower for data::ExternCrateData {
158158
name: self.name,
159159
crate_num: self.crate_num,
160160
location: self.location,
161-
span: SpanData::from_span(self.span, cm),
161+
span: SpanData::from_span(self.span, cm),
162162
scope: self.scope,
163163
}
164164
}
@@ -177,7 +177,7 @@ impl Lower for data::FunctionCallData {
177177

178178
fn lower(self, cm: &CodeMap) -> FunctionCallData {
179179
FunctionCallData {
180-
span: SpanData::from_span(self.span, cm),
180+
span: SpanData::from_span(self.span, cm),
181181
scope: self.scope,
182182
ref_id: self.ref_id.index.as_u32(),
183183
}
@@ -204,7 +204,7 @@ impl Lower for data::FunctionData {
204204
name: self.name,
205205
qualname: self.qualname,
206206
declaration: self.declaration.map(|id| id.index.as_u32()),
207-
span: SpanData::from_span(self.span, cm),
207+
span: SpanData::from_span(self.span, cm),
208208
scope: self.scope,
209209
}
210210
}
@@ -223,7 +223,7 @@ impl Lower for data::FunctionRefData {
223223

224224
fn lower(self, cm: &CodeMap) -> FunctionRefData {
225225
FunctionRefData {
226-
span: SpanData::from_span(self.span, cm),
226+
span: SpanData::from_span(self.span, cm),
227227
scope: self.scope,
228228
ref_id: self.ref_id.index.as_u32(),
229229
}
@@ -244,7 +244,7 @@ impl Lower for data::ImplData {
244244
fn lower(self, cm: &CodeMap) -> ImplData {
245245
ImplData {
246246
id: self.id,
247-
span: SpanData::from_span(self.span, cm),
247+
span: SpanData::from_span(self.span, cm),
248248
scope: self.scope,
249249
trait_ref: self.trait_ref.map(|id| id.index.as_u32()),
250250
self_ref: self.self_ref.map(|id| id.index.as_u32()),
@@ -264,7 +264,7 @@ impl Lower for data::InheritanceData {
264264

265265
fn lower(self, cm: &CodeMap) -> InheritanceData {
266266
InheritanceData {
267-
span: SpanData::from_span(self.span, cm),
267+
span: SpanData::from_span(self.span, cm),
268268
base_id: self.base_id.index.as_u32(),
269269
deriv_id: self.deriv_id
270270
}
@@ -284,7 +284,7 @@ impl Lower for data::MacroData {
284284

285285
fn lower(self, cm: &CodeMap) -> MacroData {
286286
MacroData {
287-
span: SpanData::from_span(self.span, cm),
287+
span: SpanData::from_span(self.span, cm),
288288
name: self.name,
289289
qualname: self.qualname,
290290
}
@@ -309,7 +309,7 @@ impl Lower for data::MacroUseData {
309309

310310
fn lower(self, cm: &CodeMap) -> MacroUseData {
311311
MacroUseData {
312-
span: SpanData::from_span(self.span, cm),
312+
span: SpanData::from_span(self.span, cm),
313313
name: self.name,
314314
qualname: self.qualname,
315315
callee_span: SpanData::from_span(self.callee_span, cm),
@@ -333,7 +333,7 @@ impl Lower for data::MethodCallData {
333333

334334
fn lower(self, cm: &CodeMap) -> MethodCallData {
335335
MethodCallData {
336-
span: SpanData::from_span(self.span, cm),
336+
span: SpanData::from_span(self.span, cm),
337337
scope: self.scope,
338338
ref_id: self.ref_id.map(|id| id.index.as_u32()),
339339
decl_id: self.decl_id.map(|id| id.index.as_u32()),
@@ -355,7 +355,7 @@ impl Lower for data::MethodData {
355355

356356
fn lower(self, cm: &CodeMap) -> MethodData {
357357
MethodData {
358-
span: SpanData::from_span(self.span, cm),
358+
span: SpanData::from_span(self.span, cm),
359359
scope: self.scope,
360360
id: self.id,
361361
qualname: self.qualname,
@@ -382,7 +382,7 @@ impl Lower for data::ModData {
382382
id: self.id,
383383
name: self.name,
384384
qualname: self.qualname,
385-
span: SpanData::from_span(self.span, cm),
385+
span: SpanData::from_span(self.span, cm),
386386
scope: self.scope,
387387
filename: self.filename,
388388
}
@@ -403,7 +403,7 @@ impl Lower for data::ModRefData {
403403

404404
fn lower(self, cm: &CodeMap) -> ModRefData {
405405
ModRefData {
406-
span: SpanData::from_span(self.span, cm),
406+
span: SpanData::from_span(self.span, cm),
407407
scope: self.scope,
408408
ref_id: self.ref_id.map(|id| id.index.as_u32()),
409409
qualname: self.qualname,
@@ -426,7 +426,7 @@ impl Lower for data::StructData {
426426

427427
fn lower(self, cm: &CodeMap) -> StructData {
428428
StructData {
429-
span: SpanData::from_span(self.span, cm),
429+
span: SpanData::from_span(self.span, cm),
430430
id: self.id,
431431
ctor_id: self.ctor_id,
432432
qualname: self.qualname,
@@ -451,7 +451,7 @@ impl Lower for data::StructVariantData {
451451

452452
fn lower(self, cm: &CodeMap) -> StructVariantData {
453453
StructVariantData {
454-
span: SpanData::from_span(self.span, cm),
454+
span: SpanData::from_span(self.span, cm),
455455
id: self.id,
456456
qualname: self.qualname,
457457
type_value: self.type_value,
@@ -475,7 +475,7 @@ impl Lower for data::TraitData {
475475

476476
fn lower(self, cm: &CodeMap) -> TraitData {
477477
TraitData {
478-
span: SpanData::from_span(self.span, cm),
478+
span: SpanData::from_span(self.span, cm),
479479
id: self.id,
480480
qualname: self.qualname,
481481
scope: self.scope,
@@ -500,7 +500,7 @@ impl Lower for data::TupleVariantData {
500500

501501
fn lower(self, cm: &CodeMap) -> TupleVariantData {
502502
TupleVariantData {
503-
span: SpanData::from_span(self.span, cm),
503+
span: SpanData::from_span(self.span, cm),
504504
id: self.id,
505505
name: self.name,
506506
qualname: self.qualname,
@@ -526,7 +526,7 @@ impl Lower for data::TypedefData {
526526
fn lower(self, cm: &CodeMap) -> TypedefData {
527527
TypedefData {
528528
id: self.id,
529-
span: SpanData::from_span(self.span, cm),
529+
span: SpanData::from_span(self.span, cm),
530530
qualname: self.qualname,
531531
value: self.value,
532532
}
@@ -547,7 +547,7 @@ impl Lower for data::TypeRefData {
547547

548548
fn lower(self, cm: &CodeMap) -> TypeRefData {
549549
TypeRefData {
550-
span: SpanData::from_span(self.span, cm),
550+
span: SpanData::from_span(self.span, cm),
551551
scope: self.scope,
552552
ref_id: self.ref_id.map(|id| id.index.as_u32()),
553553
qualname: self.qualname,
@@ -570,7 +570,7 @@ impl Lower for data::UseData {
570570
fn lower(self, cm: &CodeMap) -> UseData {
571571
UseData {
572572
id: self.id,
573-
span: SpanData::from_span(self.span, cm),
573+
span: SpanData::from_span(self.span, cm),
574574
name: self.name,
575575
mod_id: self.mod_id.map(|id| id.index.as_u32()),
576576
scope: self.scope,
@@ -592,7 +592,7 @@ impl Lower for data::UseGlobData {
592592
fn lower(self, cm: &CodeMap) -> UseGlobData {
593593
UseGlobData {
594594
id: self.id,
595-
span: SpanData::from_span(self.span, cm),
595+
span: SpanData::from_span(self.span, cm),
596596
names: self.names,
597597
scope: self.scope,
598598
}
@@ -619,7 +619,7 @@ impl Lower for data::VariableData {
619619
id: self.id,
620620
name: self.name,
621621
qualname: self.qualname,
622-
span: SpanData::from_span(self.span, cm),
622+
span: SpanData::from_span(self.span, cm),
623623
scope: self.scope,
624624
value: self.value,
625625
type_value: self.type_value,
@@ -643,7 +643,7 @@ impl Lower for data::VariableRefData {
643643
fn lower(self, cm: &CodeMap) -> VariableRefData {
644644
VariableRefData {
645645
name: self.name,
646-
span: SpanData::from_span(self.span, cm),
646+
span: SpanData::from_span(self.span, cm),
647647
scope: self.scope,
648648
ref_id: self.ref_id.index.as_u32(),
649649
}

‎src/librustc_save_analysis/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ pub fn process_crate<'l, 'tcx>(tcx: &'l TyCtxt<'tcx>,
763763
let mut visitor = DumpVisitor::new(tcx, save_ctxt, analysis, &mut dumper);
764764

765765
visitor.dump_crate_info(cratename, krate);
766-
visit::walk_crate(&mut visitor, krate);
766+
visit::walk_crate(&mut visitor, krate);
767767
}}
768768
}
769769

0 commit comments

Comments
 (0)