diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2016-12-17 14:37:40 -1000 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2016-12-22 15:18:03 +1300 |
| commit | 5d971ab5f27e802409c49a3ee5642c433b2cca3b (patch) | |
| tree | 9ddb303b1852493d79501c3de8e7e94e4766bd2a | |
| parent | d8492367bf9de1baeeb18498f521be6f180ff89d (diff) | |
| download | rust-5d971ab5f27e802409c49a3ee5642c433b2cca3b.tar.gz rust-5d971ab5f27e802409c49a3ee5642c433b2cca3b.zip | |
save-analysis signature stuff for json-api flavour.
| -rw-r--r-- | src/librustc_save_analysis/json_api_dumper.rs | 16 | ||||
| -rw-r--r-- | 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 @@ impl From<EnumData> for 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 @@ impl From<TupleVariantData> for Option<Def> { children: vec![], decl_id: None, docs: data.docs, - sig: None, + sig: Some(From::from(data.sig)), }) } } @@ -259,7 +259,7 @@ impl From<StructVariantData> for Option<Def> { children: vec![], decl_id: None, docs: data.docs, - sig: None, + sig: Some(From::from(data.sig)), }) } } @@ -297,7 +297,7 @@ impl From<TraitData> for Option<Def> { parent: None, decl_id: None, docs: data.docs, - sig: None, + sig: Some(From::from(data.sig)), }), _ => None, } @@ -317,7 +317,7 @@ impl From<FunctionData> for 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 @@ impl From<MethodData> for 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 @@ impl From<ModData> for Option<Def> { parent: None, decl_id: None, docs: data.docs, - sig: None, + sig: Some(From::from(data.sig)), }), _ => None, } @@ -394,7 +394,7 @@ impl From<TypeDefData> for 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 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> { 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 { |