language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rename FilesDatabase -> SourceDatabase

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-26 11:20:30 +03:00
parent 3223de5976
commit 4711cbcace
17 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/db.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use ra_syntax::{SyntaxNode, TreeArc, SourceFile};
use ra_db::{FilesDatabase, CrateId, salsa};
use ra_db::{SourceDatabase, CrateId, salsa};
use crate::{
MacroCallId, HirFileId,
@ -19,7 +19,7 @@ use crate::{
};
#[salsa::query_group(HirDatabaseStorage)]
pub trait HirDatabase: FilesDatabase + AsRef<HirInterner> {
pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> {
#[salsa::invoke(HirFileId::hir_source_file)]
fn hir_source_file(&self, file_id: HirFileId) -> TreeArc<SourceFile>;

4
crates/ra_hir/src/mock.rs
View file

@ -2,7 +2,7 @@ use std::{sync::Arc, panic};
use parking_lot::Mutex;
use ra_db::{
CheckCanceled, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, FilesDatabase, salsa,
CheckCanceled, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, SourceDatabase, salsa,
};
use relative_path::RelativePathBuf;
use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset};
@ -11,7 +11,7 @@ use crate::{db, HirInterner};
pub const WORKSPACE: SourceRootId = SourceRootId(0);
#[salsa::database(ra_db::FilesDatabaseStorage, db::HirDatabaseStorage)]
#[salsa::database(ra_db::SourceDatabaseStorage, db::HirDatabaseStorage)]
#[derive(Debug)]
pub(crate) struct MockDatabase {
events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,

2
crates/ra_hir/src/nameres/tests.rs
View file

@ -1,6 +1,6 @@
use std::sync::Arc;
use ra_db::{CrateGraph, SourceRootId, FilesDatabase};
use ra_db::{CrateGraph, SourceRootId, SourceDatabase};
use relative_path::RelativePath;
use test_utils::{assert_eq_text, covers};

2
crates/ra_hir/src/ty/tests.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use std::fmt::Write;
use ra_db::{FilesDatabase, salsa::Database};
use ra_db::{SourceDatabase, salsa::Database};
use ra_syntax::ast::{self, AstNode};
use crate::{