From ccd1b0800a5de5e046e6e9a4b6f49030c1ce3639 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 28 Nov 2019 12:50:26 +0300
Subject: Rename Source -> InFile
---
crates/ra_hir/src/code_model/src.rs | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
(limited to 'crates/ra_hir/src/code_model')
diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs
index bf3ee0834..6fd4e7987 100644
--- a/crates/ra_hir/src/code_model/src.rs
+++ b/crates/ra_hir/src/code_model/src.rs
@@ -9,18 +9,18 @@ use crate::{
Module, ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union,
};
-pub use hir_expand::Source;
+pub use hir_expand::InFile;
pub trait HasSource {
type Ast;
- fn source(self, db: &impl DefDatabase) -> Source<Self::Ast>;
+ fn source(self, db: &impl DefDatabase) -> InFile<Self::Ast>;
}
/// NB: Module is !HasSource, because it has two source nodes at the same time:
/// definition and declaration.
impl Module {
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
- pub fn definition_source(self, db: &impl DefDatabase) -> Source<ModuleSource> {
+ pub fn definition_source(self, db: &impl DefDatabase) -> InFile<ModuleSource> {
let def_map = db.crate_def_map(self.id.krate);
let src = def_map[self.id.local_id].definition_source(db);
src.map(|it| match it {
@@ -31,7 +31,7 @@ impl Module {
/// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`.
/// `None` for the crate root.
- pub fn declaration_source(self, db: &impl DefDatabase) -> Option<Source<ast::Module>> {
+ pub fn declaration_source(self, db: &impl DefDatabase) -> Option<InFile<ast::Module>> {
let def_map = db.crate_def_map(self.id.krate);
def_map[self.id.local_id].declaration_source(db)
}
@@ -39,7 +39,7 @@ impl Module {
impl HasSource for StructField {
type Ast = FieldSource;
- fn source(self, db: &impl DefDatabase) -> Source<FieldSource> {
+ fn source(self, db: &impl DefDatabase) -> InFile<FieldSource> {
let var = VariantId::from(self.parent);
let src = var.child_source(db);
src.map(|it| match it[self.id].clone() {
@@ -50,67 +50,67 @@ impl HasSource for StructField {
}
impl HasSource for Struct {
type Ast = ast::StructDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::StructDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::StructDef> {
self.id.source(db)
}
}
impl HasSource for Union {
type Ast = ast::UnionDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::UnionDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::UnionDef> {
self.id.source(db)
}
}
impl HasSource for Enum {
type Ast = ast::EnumDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::EnumDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::EnumDef> {
self.id.source(db)
}
}
impl HasSource for EnumVariant {
type Ast = ast::EnumVariant;
- fn source(self, db: &impl DefDatabase) -> Source<ast::EnumVariant> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::EnumVariant> {
self.parent.id.child_source(db).map(|map| map[self.id].clone())
}
}
impl HasSource for Function {
type Ast = ast::FnDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::FnDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::FnDef> {
self.id.lookup(db).source(db)
}
}
impl HasSource for Const {
type Ast = ast::ConstDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::ConstDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::ConstDef> {
self.id.lookup(db).source(db)
}
}
impl HasSource for Static {
type Ast = ast::StaticDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::StaticDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::StaticDef> {
self.id.lookup(db).source(db)
}
}
impl HasSource for Trait {
type Ast = ast::TraitDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::TraitDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::TraitDef> {
self.id.source(db)
}
}
impl HasSource for TypeAlias {
type Ast = ast::TypeAliasDef;
- fn source(self, db: &impl DefDatabase) -> Source<ast::TypeAliasDef> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::TypeAliasDef> {
self.id.lookup(db).source(db)
}
}
impl HasSource for MacroDef {
type Ast = ast::MacroCall;
- fn source(self, db: &impl DefDatabase) -> Source<ast::MacroCall> {
- Source { file_id: self.id.ast_id.file_id(), value: self.id.ast_id.to_node(db) }
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::MacroCall> {
+ InFile { file_id: self.id.ast_id.file_id(), value: self.id.ast_id.to_node(db) }
}
}
impl HasSource for ImplBlock {
type Ast = ast::ImplBlock;
- fn source(self, db: &impl DefDatabase) -> Source<ast::ImplBlock> {
+ fn source(self, db: &impl DefDatabase) -> InFile<ast::ImplBlock> {
self.id.source(db)
}
}
@@ -118,7 +118,7 @@ impl HasSource for Import {
type Ast = Either<ast::UseTree, ast::ExternCrateItem>;
/// Returns the syntax of the last path segment corresponding to this import
- fn source(self, db: &impl DefDatabase) -> Source<Self::Ast> {
+ fn source(self, db: &impl DefDatabase) -> InFile<Self::Ast> {
let src = self.parent.definition_source(db);
let (_, source_map) = db.raw_items_with_source_map(src.file_id);
let root = db.parse_or_expand(src.file_id).unwrap();
--
cgit v1.2.3