Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1308

Browse source 
1308: add profile calls to parsing/expansion routines r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-05-22 08:40:09 +00:00
commit 35b60d6893
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/ra_db/Cargo.toml
View file

@ -12,4 +12,5 @@ parking_lot = "0.7.0"
ra_arena = { path = "../ra_arena" }
ra_syntax = { path = "../ra_syntax" }
ra_prof = { path = "../ra_prof" }
test_utils = { path = "../test_utils" }

5
crates/ra_db/src/lib.rs
View file

@ -6,6 +6,7 @@ use std::{panic, sync::Arc};
use ra_syntax::{TextUnit, TextRange, SourceFile, TreeArc};
use relative_path::RelativePathBuf;
use ra_prof::profile;
pub use ::salsa as salsa;
pub use crate::{
@ -72,6 +73,7 @@ pub trait SourceDatabase: CheckCanceled + std::fmt::Debug {
#[salsa::input]
fn file_text(&self, file_id: FileId) -> Arc<String>;
// Parses the file into the syntax tree.
#[salsa::invoke(parse_query)]
fn parse(&self, file_id: FileId) -> TreeArc<SourceFile>;
/// Path to a file, relative to the root of its source root.
#[salsa::input]
@ -96,7 +98,8 @@ fn source_root_crates(db: &impl SourceDatabase, id: SourceRootId) -> Arc<Vec<Cra
Arc::new(res)
}
fn parse(db: &impl SourceDatabase, file_id: FileId) -> TreeArc<SourceFile> {
fn parse_query(db: &impl SourceDatabase, file_id: FileId) -> TreeArc<SourceFile> {
let _p = profile("parse_query");
let text = db.file_text(file_id);
SourceFile::parse(&*text)
}

2
crates/ra_hir/src/ids.rs
View file

@ -5,6 +5,7 @@ use std::{
use ra_db::{FileId, salsa};
use ra_syntax::{TreeArc, AstNode, ast, SyntaxNode};
use ra_prof::profile;
use mbe::MacroRules;
use crate::{
@ -60,6 +61,7 @@ impl HirFileId {
db: &impl DefDatabase,
file_id: HirFileId,
) -> Option<TreeArc<SyntaxNode>> {
let _p = profile("parse_or_expand_query");
match file_id.0 {
HirFileIdRepr::File(file_id) => Some(db.parse(file_id).syntax().to_owned()),
HirFileIdRepr::Macro(macro_file) => {