Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 15:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

save-analysis: merge StructRef and TypeRef

Browse Source
This commit is contained in:
Nick Cameron
2015-06-08 17:47:52 +12:00
parent 78c25eabd5
commit 04b32cecac
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustc_trans/save/dump_csv.rs
+4 -4
View File
@@ -249,7 +249,7 @@ fn lookup_def_kind(&self, ref_id: NodeId, span: Span) -> Option<recorder::Row> {
match def {
def::DefMod(_) |
def::DefForeignMod(_) => Some(recorder::ModRef),
def::DefStruct(_) => Some(recorder::StructRef),
def::DefStruct(_) => Some(recorder::TypeRef),
def::DefTy(..) |
def::DefAssociatedTy(..) |
def::DefTrait(_) => Some(recorder::TypeRef),
@@ -785,7 +785,7 @@ fn process_path(&mut self,
sub_span,
def.def_id(),
self.cur_scope),
def::DefStruct(def_id) => self.fmt.ref_str(recorder::StructRef,
def::DefStruct(def_id) => self.fmt.ref_str(recorder::TypeRef,
span,
sub_span,
def_id,
@@ -886,7 +886,7 @@ fn process_struct_lit(&mut self,
let struct_def = match *ty {
ty::TyStruct(def_id, _) => {
let sub_span = self.span.span_for_last_ident(path.span);
self.fmt.ref_str(recorder::StructRef,
self.fmt.ref_str(recorder::TypeRef,
path.span,
sub_span,
def_id,
@@ -918,7 +918,7 @@ fn process_struct_lit(&mut self,
None => {}
}
self.visit_expr(&*field.expr)
self.visit_expr(&field.expr)
}
visit::walk_expr_opt(self, base)
}
src/librustc_trans/save/recorder.rs
-4
View File
@@ -89,7 +89,6 @@ pub enum Row {
ModRef,
VarRef,
TypeRef,
StructRef,
FnRef,
}
@@ -150,9 +149,6 @@ fn lookup_row(r: Row) -> (&'static str, Vec<&'static str>, bool, bool) {
TypeRef => ("type_ref",
vec!("refid","refidcrate","qualname","scopeid"),
true, true),
StructRef => ("struct_ref",
vec!("refid","refidcrate","qualname","scopeid"),
true, true),
FnRef => ("fn_ref", vec!("refid","refidcrate","qualname","scopeid"), true, true)
}
}