From 1076e82856f353763de8426d378fcd1e371cbed4 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 2 Jan 2019 16:00:35 +0300 Subject: [PATCH] small rename --- crates/ra_hir/src/ids.rs | 4 ++-- crates/ra_hir/src/module/imp.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index 6d59ef6596d..a09dee8b1d3 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs @@ -31,12 +31,12 @@ pub struct HirFileId(HirFileIdRepr); impl HirFileId { /// For macro-expansion files, returns the file original source file the /// expansionoriginated from. - pub(crate) fn original_file_id(self, db: &impl HirDatabase) -> FileId { + pub(crate) fn original_file(self, db: &impl HirDatabase) -> FileId { match self.0 { HirFileIdRepr::File(file_id) => file_id, HirFileIdRepr::Macro(macro_call_id) => { let loc = macro_call_id.loc(db); - loc.source_item_id.file_id.original_file_id(db) + loc.source_item_id.file_id.original_file(db) } } } diff --git a/crates/ra_hir/src/module/imp.rs b/crates/ra_hir/src/module/imp.rs index d1498a64647..3849026dbdd 100644 --- a/crates/ra_hir/src/module/imp.rs +++ b/crates/ra_hir/src/module/imp.rs @@ -155,7 +155,7 @@ fn resolve_submodule( name: &Name, ) -> (Vec, Option) { // FIXME: handle submodules of inline modules properly - let file_id = source.file_id().original_file_id(db); + let file_id = source.file_id().original_file(db); let source_root_id = db.file_source_root(file_id); let path = db.file_relative_path(file_id); let root = RelativePathBuf::default();