Merge #1991

1991: Use `original_file` instead of `as_original_file` r=matklad a=sinkuu

I saw ra_lsp_server panics originating from `as_original_file`, though I have not been able to reproduce.

Co-authored-by: Shotaro Yamada <[email protected]>

1 files changed, 0 insertions, 10 deletions

diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index a3b65cc79..85b022744 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -50,16 +50,6 @@ impl HirFileId {
         }
     }
 
-    /// XXX: this is a temporary function, which should go away when we implement the
-    /// nameresolution+macro expansion combo. Prefer using `original_file` if
-    /// possible.
-    pub fn as_original_file(self) -> FileId {
-        match self.0 {
-            HirFileIdRepr::File(file_id) => file_id,
-            HirFileIdRepr::Macro(_r) => panic!("macro generated file: {:?}", self),
-        }
-    }
-
     /// Get the crate which the macro lives in, if it is a macro file.
     pub(crate) fn macro_crate(self, db: &impl AstDatabase) -> Option<Crate> {
         match self.0 {