save-analysis signature stuff for json-api flavour.

diff --git a/src/librustc_save_analysis/json_api_dumper.rs b/src/librustc_save_analysis/json_api_dumper.rs
index 777e64fe77f8b85623373b23b973560933233432..342c33af2f8963854b65a15e5a60e6c0e76c78a9 100644 (file)
--- a/src/librustc_save_analysis/json_api_dumper.rs
+++ b/src/librustc_save_analysis/json_api_dumper.rs
@@ -222,7 +222,7 @@ fn from(data: EnumData) -> Option<Def> {
                 children: data.variants.into_iter().map(|id| From::from(id)).collect(),
                 decl_id: None,
                 docs: data.docs,
-                sig: None,
+                sig: Some(From::from(data.sig)),
             }),
             _ => None,
         }
@@ -242,7 +242,7 @@ fn from(data: TupleVariantData) -> Option<Def> {
             children: vec![],
             decl_id: None,
             docs: data.docs,
-            sig: None,
+            sig: Some(From::from(data.sig)),
         })
     }
 }
@@ -259,7 +259,7 @@ fn from(data: StructVariantData) -> Option<Def> {
             children: vec![],
             decl_id: None,
             docs: data.docs,
-            sig: None,
+            sig: Some(From::from(data.sig)),
         })
     }
 }
@@ -297,7 +297,7 @@ fn from(data: TraitData) -> Option<Def> {
                 parent: None,
                 decl_id: None,
                 docs: data.docs,
-                sig: None,
+                sig: Some(From::from(data.sig)),
             }),
             _ => None,
         }
@@ -317,7 +317,7 @@ fn from(data: FunctionData) -> Option<Def> {
                 parent: data.parent.map(|id| From::from(id)),
                 decl_id: None,
                 docs: data.docs,
-                sig: None,
+                sig: Some(From::from(data.sig)),
             }),
             _ => None,
         }
@@ -337,7 +337,7 @@ fn from(data: MethodData) -> Option<Def> {
                 parent: data.parent.map(|id| From::from(id)),
                 decl_id: data.decl_id.map(|id| From::from(id)),
                 docs: data.docs,
-                sig: None,
+                sig: Some(From::from(data.sig)),
             }),
             _ => None,
         }
@@ -374,7 +374,7 @@ fn from(data:ModData) -> Option<Def> {
                 parent: None,
                 decl_id: None,
                 docs: data.docs,
-                sig: None,
+                sig: Some(From::from(data.sig)),
             }),
             _ => None,
         }
@@ -394,7 +394,7 @@ fn from(data: TypeDefData) -> Option<Def> {
                 parent: data.parent.map(|id| From::from(id)),
                 decl_id: None,
                 docs: String::new(),
-                sig: None,
+                sig: data.sig.map(|s| From::from(s)),
             }),
             _ => None,
         }

diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs
index d854c434d665b5fafcdedaebb34c415e0a260812..491521a3239495454e9bb5680bf1535b26b1dff0 100644 (file)
--- a/src/librustc_save_analysis/lib.rs
+++ b/src/librustc_save_analysis/lib.rs
@@ -414,7 +414,6 @@ pub fn get_method_data(&self, id: ast::NodeId,
 
         let name = name.to_string();
         let text = self.span_utils.signature_string_for_span(span);
-        println!("text: `{}`, name: `{}`", text, name);
         let ident_start = text.find(&name).unwrap();
         let ident_end = ident_start + name.len();
         let sig = Signature {