save-analysis: add a decl_id for methods

Nick Cameron · Nick Cameron · commit a835d7487cc7 · 2016-06-16T11:28:39.000+01:00
This is non-null if the method is in a (non-inherent) impl and in that case will be the id for the method declaration in the implemented trait.
diff --git a/src/librustc_save_analysis/data.rs b/src/librustc_save_analysis/data.rs
@@ -214,6 +214,7 @@ pub struct MethodData {
     pub span: Span,
     pub scope: NodeId,
     pub value: String,
+    pub decl_id: Option<DefId>,
 }
 
 /// Data for modules.
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
@@ -30,7 +30,7 @@
 use rustc::hir::def::Def;
 use rustc::hir::def_id::DefId;
 use rustc::session::Session;
-use rustc::ty::{self, TyCtxt};
+use rustc::ty::{self, TyCtxt, ImplOrTraitItem, ImplOrTraitItemContainer};
 
 use std::collections::HashSet;
 use std::hash::*;
@@ -381,24 +381,42 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
 
             let sig_str = ::make_signature(&sig.decl, &sig.generics);
             if body.is_some() {
-                if !self.span.filter_generated(Some(method_data.span), span) {
-                    let mut data = method_data.clone();
-                    data.value = sig_str;
-                    self.dumper.function(data.lower(self.tcx));
-                }
                 self.process_formals(&sig.decl.inputs, &method_data.qualname);
-            } else {
-                if !self.span.filter_generated(Some(method_data.span), span) {
-                    self.dumper.method(MethodData {
-                        id: method_data.id,
-                        name: method_data.name,
-                        span: method_data.span,
-                        scope: method_data.scope,
-                        qualname: method_data.qualname.clone(),
-                        value: sig_str,
-                    }.lower(self.tcx));
-                }
             }
+
+            // If the method is defined in an impl, then try and find the corresponding
+            // method decl in a trait, and if there is one, make a decl_id for it. This
+            // requires looking up the impl, then the trait, then searching for a method
+            // with the right name.
+            if !self.span.filter_generated(Some(method_data.span), span) {
+                let container =
+                    self.tcx.impl_or_trait_item(self.tcx.map.local_def_id(id)).container();
+                let decl_id = if let ImplOrTraitItemContainer::ImplContainer(id) = container {
+                    self.tcx.trait_id_of_impl(id).and_then(|id| {
+                        for item in &**self.tcx.trait_items(id) {
+                            if let &ImplOrTraitItem::MethodTraitItem(ref m) = item {
+                                if m.name == name {
+                                    return Some(m.def_id);
+                                }
+                            }
+                        }
+                        None
+                    })
+                } else {
+                    None
+                };
+
+                self.dumper.method(MethodData {
+                    id: method_data.id,
+                    name: method_data.name,
+                    span: method_data.span,
+                    scope: method_data.scope,
+                    qualname: method_data.qualname.clone(),
+                    value: sig_str,
+                    decl_id: decl_id,
+                }.lower(self.tcx));
+            }
+
             self.process_generic_params(&sig.generics, span, &method_data.qualname, id);
         }
 
diff --git a/src/librustc_save_analysis/external_data.rs b/src/librustc_save_analysis/external_data.rs
@@ -321,6 +321,7 @@ pub struct MethodData {
     pub span: SpanData,
     pub scope: DefId,
     pub value: String,
+    pub decl_id: Option<DefId>,
 }
 
 impl Lower for data::MethodData {
@@ -334,6 +335,7 @@ impl Lower for data::MethodData {
             id: make_def_id(self.id, &tcx.map),
             qualname: self.qualname,
             value: self.value,
+            decl_id: self.decl_id,
         }
     }
 }
diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs
@@ -182,6 +182,7 @@ struct Def {
     qualname: String,
     value: String,
     children: Vec<Id>,
+    decl_id: Option<Id>,
 }
 
 #[derive(Debug, RustcEncodable)]
@@ -221,6 +222,7 @@ impl From<EnumData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: data.variants.into_iter().map(|id| From::from(id)).collect(),
+            decl_id: None,
         }
     }
 }
@@ -235,6 +237,7 @@ impl From<TupleVariantData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: vec![],
+            decl_id: None,
         }
     }
 }
@@ -248,6 +251,7 @@ impl From<StructVariantData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: vec![],
+            decl_id: None,
         }
     }
 }
@@ -261,6 +265,7 @@ impl From<StructData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: data.fields.into_iter().map(|id| From::from(id)).collect(),
+            decl_id: None,
         }
     }
 }
@@ -274,6 +279,7 @@ impl From<TraitData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: data.items.into_iter().map(|id| From::from(id)).collect(),
+            decl_id: None,
         }
     }
 }
@@ -287,6 +293,7 @@ impl From<FunctionData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: vec![],
+            decl_id: None,
         }
     }
 }
@@ -300,6 +307,7 @@ impl From<MethodData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: vec![],
+            decl_id: data.decl_id.map(|id| From::from(id)),
         }
     }
 }
@@ -313,6 +321,7 @@ impl From<MacroData> for Def {
             qualname: data.qualname,
             value: String::new(),
             children: vec![],
+            decl_id: None,
         }
     }
 }
@@ -326,6 +335,7 @@ impl From<ModData> for Def {
             qualname: data.qualname,
             value: data.filename,
             children: data.items.into_iter().map(|id| From::from(id)).collect(),
+            decl_id: None,
         }
     }
 }
@@ -339,6 +349,7 @@ impl From<TypeDefData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: vec![],
+            decl_id: None,
         }
     }
 }
@@ -357,6 +368,7 @@ impl From<VariableData> for Def {
             qualname: data.qualname,
             value: data.value,
             children: vec![],
+            decl_id: None,
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ pub struct MethodData {`
`214`	`214`	`pub span: Span,`
`215`	`215`	`pub scope: NodeId,`
`216`	`216`	`pub value: String,`
	`217`	`+ pub decl_id: Option<DefId>,`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`/// Data for modules.`
Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,7 @@ pub struct MethodData {`
`321`	`321`	`pub span: SpanData,`
`322`	`322`	`pub scope: DefId,`
`323`	`323`	`pub value: String,`
	`324`	`+ pub decl_id: Option<DefId>,`
`324`	`325`	`}`
`325`	`326`
`326`	`327`	`impl Lower for data::MethodData {`
`@@ -334,6 +335,7 @@ impl Lower for data::MethodData {`
`334`	`335`	`id: make_def_id(self.id, &tcx.map),`
`335`	`336`	`qualname: self.qualname,`
`336`	`337`	`value: self.value,`
	`338`	`+ decl_id: self.decl_id,`
`337`	`339`	`}`
`338`	`340`	`}`
`339`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ struct Def {`
`182`	`182`	`qualname: String,`
`183`	`183`	`value: String,`
`184`	`184`	`children: Vec<Id>,`
	`185`	`+ decl_id: Option<Id>,`
`185`	`186`	`}`
`186`	`187`
`187`	`188`	`#[derive(Debug, RustcEncodable)]`
`@@ -221,6 +222,7 @@ impl From<EnumData> for Def {`
`221`	`222`	`qualname: data.qualname,`
`222`	`223`	`value: data.value,`
`223`	`224`	`children: data.variants.into_iter().map(\|id\| From::from(id)).collect(),`
	`225`	`+ decl_id: None,`
`224`	`226`	`}`
`225`	`227`	`}`
`226`	`228`	`}`
`@@ -235,6 +237,7 @@ impl From<TupleVariantData> for Def {`
`235`	`237`	`qualname: data.qualname,`
`236`	`238`	`value: data.value,`
`237`	`239`	`children: vec![],`
	`240`	`+ decl_id: None,`
`238`	`241`	`}`
`239`	`242`	`}`
`240`	`243`	`}`
`@@ -248,6 +251,7 @@ impl From<StructVariantData> for Def {`
`248`	`251`	`qualname: data.qualname,`
`249`	`252`	`value: data.value,`
`250`	`253`	`children: vec![],`
	`254`	`+ decl_id: None,`
`251`	`255`	`}`
`252`	`256`	`}`
`253`	`257`	`}`
`@@ -261,6 +265,7 @@ impl From<StructData> for Def {`
`261`	`265`	`qualname: data.qualname,`
`262`	`266`	`value: data.value,`
`263`	`267`	`children: data.fields.into_iter().map(\|id\| From::from(id)).collect(),`
	`268`	`+ decl_id: None,`
`264`	`269`	`}`
`265`	`270`	`}`
`266`	`271`	`}`
`@@ -274,6 +279,7 @@ impl From<TraitData> for Def {`
`274`	`279`	`qualname: data.qualname,`
`275`	`280`	`value: data.value,`
`276`	`281`	`children: data.items.into_iter().map(\|id\| From::from(id)).collect(),`
	`282`	`+ decl_id: None,`
`277`	`283`	`}`
`278`	`284`	`}`
`279`	`285`	`}`
`@@ -287,6 +293,7 @@ impl From<FunctionData> for Def {`
`287`	`293`	`qualname: data.qualname,`
`288`	`294`	`value: data.value,`
`289`	`295`	`children: vec![],`
	`296`	`+ decl_id: None,`
`290`	`297`	`}`
`291`	`298`	`}`
`292`	`299`	`}`
`@@ -300,6 +307,7 @@ impl From<MethodData> for Def {`
`300`	`307`	`qualname: data.qualname,`
`301`	`308`	`value: data.value,`
`302`	`309`	`children: vec![],`
	`310`	`+ decl_id: data.decl_id.map(\|id\| From::from(id)),`
`303`	`311`	`}`
`304`	`312`	`}`
`305`	`313`	`}`
`@@ -313,6 +321,7 @@ impl From<MacroData> for Def {`
`313`	`321`	`qualname: data.qualname,`
`314`	`322`	`value: String::new(),`
`315`	`323`	`children: vec![],`
	`324`	`+ decl_id: None,`
`316`	`325`	`}`
`317`	`326`	`}`
`318`	`327`	`}`
`@@ -326,6 +335,7 @@ impl From<ModData> for Def {`
`326`	`335`	`qualname: data.qualname,`
`327`	`336`	`value: data.filename,`
`328`	`337`	`children: data.items.into_iter().map(\|id\| From::from(id)).collect(),`
	`338`	`+ decl_id: None,`
`329`	`339`	`}`
`330`	`340`	`}`
`331`	`341`	`}`
`@@ -339,6 +349,7 @@ impl From<TypeDefData> for Def {`
`339`	`349`	`qualname: data.qualname,`
`340`	`350`	`value: data.value,`
`341`	`351`	`children: vec![],`
	`352`	`+ decl_id: None,`
`342`	`353`	`}`
`343`	`354`	`}`
`344`	`355`	`}`
`@@ -357,6 +368,7 @@ impl From<VariableData> for Def {`
`357`	`368`	`qualname: data.qualname,`
`358`	`369`	`value: data.value,`
`359`	`370`	`children: vec![],`
	`371`	`+ decl_id: None,`
`360`	`372`	`}`
`361`	`373`	`}`
`362`	`374`	`}`