From f8b36bbc3b968754b71844d942286e81415627b8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 7 Nov 2018 18:32:33 +0300 Subject: Rename File -> SourceFileNode --- crates/ra_analysis/src/db.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_analysis/src/db.rs') diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index 627512553..194f1a6b0 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use ra_editor::LineIndex; -use ra_syntax::{File, SyntaxNode}; +use ra_syntax::{SourceFileNode, SyntaxNode}; use salsa::{self, Database}; use crate::{ @@ -85,7 +85,7 @@ salsa::database_storage! { salsa::query_group! { pub(crate) trait SyntaxDatabase: crate::input::FilesDatabase { - fn file_syntax(file_id: FileId) -> File { + fn file_syntax(file_id: FileId) -> SourceFileNode { type FileSyntaxQuery; } fn file_lines(file_id: FileId) -> Arc { @@ -103,9 +103,9 @@ salsa::query_group! { } } -fn file_syntax(db: &impl SyntaxDatabase, file_id: FileId) -> File { +fn file_syntax(db: &impl SyntaxDatabase, file_id: FileId) -> SourceFileNode { let text = db.file_text(file_id); - File::parse(&*text) + SourceFileNode::parse(&*text) } fn file_lines(db: &impl SyntaxDatabase, file_id: FileId) -> Arc { let text = db.file_text(file_id); -- cgit v1.2.3