From fe53b282500f32c2d0cc1dfee1d7ccddfedac583 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 7 Jan 2019 17:00:39 +0300 Subject: migrate ra_db to new rowan --- crates/ra_db/src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_db/src/lib.rs') diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index 7181f2950..3c41ee56d 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs @@ -8,7 +8,7 @@ pub mod mock; use std::sync::Arc; use ra_editor::LineIndex; -use ra_syntax::{TextUnit, TextRange, SourceFileNode}; +use ra_syntax::{TextUnit, TextRange, SourceFile, TreePtr}; pub use crate::{ cancelation::{Canceled, Cancelable}, @@ -47,7 +47,7 @@ pub trait BaseDatabase: salsa::Database { salsa::query_group! { pub trait SyntaxDatabase: crate::input::FilesDatabase + BaseDatabase { - fn source_file(file_id: FileId) -> SourceFileNode { + fn source_file(file_id: FileId) -> TreePtr { type SourceFileQuery; } fn file_lines(file_id: FileId) -> Arc { @@ -56,9 +56,9 @@ salsa::query_group! { } } -fn source_file(db: &impl SyntaxDatabase, file_id: FileId) -> SourceFileNode { +fn source_file(db: &impl SyntaxDatabase, file_id: FileId) -> TreePtr { let text = db.file_text(file_id); - SourceFileNode::parse(&*text) + SourceFile::parse(&*text) } fn file_lines(db: &impl SyntaxDatabase, file_id: FileId) -> Arc { let text = db.file_text(file_id); -- cgit v1.2.3