mirror of https://github.com/rust-lang/rust.git
rename
This commit is contained in:
parent
5e7f4202cf
commit
00df339c41
|
@ -127,7 +127,7 @@ salsa::database_storage! {
|
|||
impl hir::db::HirDatabase {
|
||||
fn module_tree() for hir::db::ModuleTreeQuery;
|
||||
fn fn_scopes() for hir::db::FnScopesQuery;
|
||||
fn _file_items() for hir::db::FileItemsQuery;
|
||||
fn _file_items() for hir::db::SourceFileItemsQuery;
|
||||
fn _file_item() for hir::db::FileItemQuery;
|
||||
fn _input_module_items() for hir::db::InputModuleItemsQuery;
|
||||
fn _item_map() for hir::db::ItemMapQuery;
|
||||
|
|
|
@ -8,7 +8,7 @@ use ra_syntax::{
|
|||
use crate::{
|
||||
FileId,
|
||||
db::SyntaxDatabase,
|
||||
hir::{FileItems, FileItemId},
|
||||
hir::{SourceFileItems, SourceFileItemId},
|
||||
hir::query_definitions,
|
||||
hir::function::{FnId, FnScopes},
|
||||
hir::module::{
|
||||
|
@ -33,13 +33,13 @@ pub(crate) trait HirDatabase: SyntaxDatabase {
|
|||
use fn query_definitions::fn_syntax;
|
||||
}
|
||||
|
||||
fn file_items(file_id: FileId) -> Arc<FileItems> {
|
||||
type FileItemsQuery;
|
||||
fn file_items(file_id: FileId) -> Arc<SourceFileItems> {
|
||||
type SourceFileItemsQuery;
|
||||
storage dependencies;
|
||||
use fn query_definitions::file_items;
|
||||
}
|
||||
|
||||
fn file_item(file_id: FileId, file_item_id: FileItemId) -> SyntaxNode {
|
||||
fn file_item(file_id: FileId, file_item_id: SourceFileItemId) -> SyntaxNode {
|
||||
type FileItemQuery;
|
||||
storage dependencies;
|
||||
use fn query_definitions::file_item;
|
||||
|
|
|
@ -51,19 +51,19 @@ impl DefId {
|
|||
|
||||
/// Identifier of item within a specific file. This is stable over reparses, so
|
||||
/// it's OK to use it as a salsa key/value.
|
||||
pub(crate) type FileItemId = Id<SyntaxNode>;
|
||||
pub(crate) type SourceFileItemId = Id<SyntaxNode>;
|
||||
|
||||
/// Maps item's `SyntaxNode`s to `FileItemId` and back.
|
||||
/// Maps item's `SyntaxNode`s to `SourceFileItemId` and back.
|
||||
#[derive(Debug, PartialEq, Eq, Default)]
|
||||
pub(crate) struct FileItems {
|
||||
pub(crate) struct SourceFileItems {
|
||||
arena: Arena<SyntaxNode>,
|
||||
}
|
||||
|
||||
impl FileItems {
|
||||
fn alloc(&mut self, item: SyntaxNode) -> FileItemId {
|
||||
impl SourceFileItems {
|
||||
fn alloc(&mut self, item: SyntaxNode) -> SourceFileItemId {
|
||||
self.arena.alloc(item)
|
||||
}
|
||||
fn id_of(&self, item: SyntaxNodeRef) -> FileItemId {
|
||||
fn id_of(&self, item: SyntaxNodeRef) -> SourceFileItemId {
|
||||
let (id, _item) = self
|
||||
.arena
|
||||
.iter()
|
||||
|
@ -73,9 +73,9 @@ impl FileItems {
|
|||
}
|
||||
}
|
||||
|
||||
impl Index<FileItemId> for FileItems {
|
||||
impl Index<SourceFileItemId> for SourceFileItems {
|
||||
type Output = SyntaxNode;
|
||||
fn index(&self, idx: FileItemId) -> &SyntaxNode {
|
||||
fn index(&self, idx: SourceFileItemId) -> &SyntaxNode {
|
||||
&self.arena[idx]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ use crate::{
|
|||
Cancelable, FileId,
|
||||
loc2id::{DefId, DefLoc},
|
||||
hir::{
|
||||
FileItemId, FileItems,
|
||||
SourceFileItemId, SourceFileItems,
|
||||
Path, PathKind,
|
||||
HirDatabase,
|
||||
module::{ModuleId, ModuleTree},
|
||||
|
@ -73,7 +73,7 @@ pub(crate) struct InputModuleItems {
|
|||
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
struct ModuleItem {
|
||||
id: FileItemId,
|
||||
id: SourceFileItemId,
|
||||
name: SmolStr,
|
||||
kind: SyntaxKind,
|
||||
vis: Vis,
|
||||
|
@ -93,7 +93,7 @@ struct Import {
|
|||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub(crate) struct NamedImport {
|
||||
file_item_id: FileItemId,
|
||||
file_item_id: SourceFileItemId,
|
||||
relative_range: TextRange,
|
||||
}
|
||||
|
||||
|
@ -135,7 +135,7 @@ pub(crate) struct Resolution {
|
|||
|
||||
impl InputModuleItems {
|
||||
pub(in crate::hir) fn new<'a>(
|
||||
file_items: &FileItems,
|
||||
file_items: &SourceFileItems,
|
||||
items: impl Iterator<Item = ast::ModuleItem<'a>>,
|
||||
) -> InputModuleItems {
|
||||
let mut res = InputModuleItems::default();
|
||||
|
@ -145,7 +145,7 @@ impl InputModuleItems {
|
|||
res
|
||||
}
|
||||
|
||||
fn add_item(&mut self, file_items: &FileItems, item: ast::ModuleItem) -> Option<()> {
|
||||
fn add_item(&mut self, file_items: &SourceFileItems, item: ast::ModuleItem) -> Option<()> {
|
||||
match item {
|
||||
ast::ModuleItem::StructDef(it) => self.items.push(ModuleItem::new(file_items, it)?),
|
||||
ast::ModuleItem::EnumDef(it) => self.items.push(ModuleItem::new(file_items, it)?),
|
||||
|
@ -166,7 +166,7 @@ impl InputModuleItems {
|
|||
Some(())
|
||||
}
|
||||
|
||||
fn add_use_item(&mut self, file_items: &FileItems, item: ast::UseItem) {
|
||||
fn add_use_item(&mut self, file_items: &SourceFileItems, item: ast::UseItem) {
|
||||
let file_item_id = file_items.id_of(item.syntax());
|
||||
let start_offset = item.syntax().range().start();
|
||||
Path::expand_use_item(item, |path, range| {
|
||||
|
@ -183,7 +183,7 @@ impl InputModuleItems {
|
|||
}
|
||||
|
||||
impl ModuleItem {
|
||||
fn new<'a>(file_items: &FileItems, item: impl ast::NameOwner<'a>) -> Option<ModuleItem> {
|
||||
fn new<'a>(file_items: &SourceFileItems, item: impl ast::NameOwner<'a>) -> Option<ModuleItem> {
|
||||
let name = item.name()?.text();
|
||||
let kind = item.syntax().kind();
|
||||
let vis = Vis::Other;
|
||||
|
|
|
@ -12,7 +12,7 @@ use ra_syntax::{
|
|||
use crate::{
|
||||
FileId, Cancelable,
|
||||
hir::{
|
||||
FileItems, FileItemId,
|
||||
SourceFileItems, SourceFileItemId,
|
||||
db::HirDatabase,
|
||||
function::{FnId, FnScopes},
|
||||
module::{
|
||||
|
@ -37,10 +37,10 @@ pub(super) fn fn_scopes(db: &impl HirDatabase, fn_id: FnId) -> Arc<FnScopes> {
|
|||
Arc::new(res)
|
||||
}
|
||||
|
||||
pub(super) fn file_items(db: &impl HirDatabase, file_id: FileId) -> Arc<FileItems> {
|
||||
pub(super) fn file_items(db: &impl HirDatabase, file_id: FileId) -> Arc<SourceFileItems> {
|
||||
let source_file = db.file_syntax(file_id);
|
||||
let source_file = source_file.borrowed();
|
||||
let mut res = FileItems::default();
|
||||
let mut res = SourceFileItems::default();
|
||||
source_file
|
||||
.syntax()
|
||||
.descendants()
|
||||
|
@ -55,7 +55,7 @@ pub(super) fn file_items(db: &impl HirDatabase, file_id: FileId) -> Arc<FileItem
|
|||
pub(super) fn file_item(
|
||||
db: &impl HirDatabase,
|
||||
file_id: FileId,
|
||||
file_item_id: FileItemId,
|
||||
file_item_id: SourceFileItemId,
|
||||
) -> SyntaxNode {
|
||||
db.file_items(file_id)[file_item_id].clone()
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@ use rustc_hash::FxHashMap;
|
|||
|
||||
use crate::{
|
||||
FileId,
|
||||
hir::{FileItemId, ModuleId},
|
||||
hir::{SourceFileItemId, ModuleId},
|
||||
syntax_ptr::SyntaxPtr,
|
||||
input::SourceRootId,
|
||||
};
|
||||
|
@ -104,7 +104,7 @@ pub(crate) enum DefLoc {
|
|||
},
|
||||
Item {
|
||||
file_id: FileId,
|
||||
id: FileItemId,
|
||||
id: SourceFileItemId,
|
||||
},
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue