diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2016-10-29 08:24:37 +1000 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2016-10-29 08:43:14 +1000 |
| commit | c751c08cf4c2a73b1a337fb74c4ccf0ee867bfac (patch) | |
| tree | 83b1674b24c40fadb9587ef494a591e8cacebea8 /src | |
| parent | 421b595f25e5dbab9c967afd03929d013f346322 (diff) | |
| download | rust-c751c08cf4c2a73b1a337fb74c4ccf0ee867bfac.tar.gz rust-c751c08cf4c2a73b1a337fb74c4ccf0ee867bfac.zip | |
save-analysis: change imports to carry a ref id rather than their own node id
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_save_analysis/json_dumper.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs index 0378d75cc6e..eb613c3afda 100644 --- a/src/librustc_save_analysis/json_dumper.rs +++ b/src/librustc_save_analysis/json_dumper.rs @@ -129,7 +129,7 @@ impl From<DefId> for Id { #[derive(Debug, RustcEncodable)] struct Import { kind: ImportKind, - id: Id, + ref_id: Option<Id>, span: SpanData, name: String, value: String, @@ -146,7 +146,7 @@ impl From<ExternCrateData> for Import { fn from(data: ExternCrateData) -> Import { Import { kind: ImportKind::ExternCrate, - id: From::from(data.id), + ref_id: None, span: data.span, name: data.name, value: String::new(), @@ -157,7 +157,7 @@ impl From<UseData> for Import { fn from(data: UseData) -> Import { Import { kind: ImportKind::Use, - id: From::from(data.id), + ref_id: data.mod_id.map(|id| From::from(id)), span: data.span, name: data.name, value: String::new(), @@ -168,7 +168,7 @@ impl From<UseGlobData> for Import { fn from(data: UseGlobData) -> Import { Import { kind: ImportKind::GlobUse, - id: From::from(data.id), + ref_id: None, span: data.span, name: "*".to_owned(), value: data.names.join(", "), |