diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-16 21:10:26 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-16 21:10:26 +0000 |
commit | edd4c1d8a6c270fe39ae881c23c722c658c87c32 (patch) | |
tree | 0e6b42eaaa3228d7af8d54355d034e698db5c743 /crates/ra_hir/src/ids.rs | |
parent | 6932b77093fd444def066e80ed37defa2742f2a9 (diff) | |
parent | 0242acae5388188c06d826f4aed41eee3e91d018 (diff) |
Merge #842
842: Turn ImplBlock into a copy type just containing IDs r=matklad a=flodiebold
This makes it more like the other code model types.
Also make Module::definition_source/declaration_source return HirFileIds, to
make them more like the other source functions.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ids.rs')
-rw-r--r-- | crates/ra_hir/src/ids.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index 8d81d5ebf..3e11dd6ad 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs | |||
@@ -74,7 +74,10 @@ impl HirFileId { | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | pub(crate) fn as_original_file(self) -> FileId { | 77 | /// XXX: this is a temporary function, which should go away when we implement the |
78 | /// nameresolution+macro expansion combo. Prefer using `original_file` if | ||
79 | /// possible. | ||
80 | pub fn as_original_file(self) -> FileId { | ||
78 | match self.0 { | 81 | match self.0 { |
79 | HirFileIdRepr::File(file_id) => file_id, | 82 | HirFileIdRepr::File(file_id) => file_id, |
80 | HirFileIdRepr::Macro(_r) => panic!("macro generated file: {:?}", self), | 83 | HirFileIdRepr::Macro(_r) => panic!("macro generated file: {:?}", self), |