From 5d971ab5f27e802409c49a3ee5642c433b2cca3b Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Sat, 17 Dec 2016 14:37:40 -1000
Subject: [PATCH] save-analysis signature stuff for json-api flavour.

---
 src/librustc_save_analysis/json_api_dumper.rs | 16 ++++++++--------
 src/librustc_save_analysis/lib.rs             |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/librustc_save_analysis/json_api_dumper.rs b/src/librustc_save_analysis/json_api_dumper.rs
index 777e64fe77f..342c33af2f8 100644
--- 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 d854c434d66..491521a3239 100644
--- 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 {
-- 
2.44.0