squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Revert "eagarly clean astd maps"

Browse source 
This reverts commit 6c63a59425.

This causes massive slowdowns: looks like we accidentally have some source-depndent
This commit is contained in:
Aleksey Kladov 2019-05-04 15:26:55 +03:00
parent b1febf2e6d
commit 8876f44054
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,7 @@ pub trait DefDatabase: SourceDatabase {
#[salsa::invoke(crate::source_id::AstIdMap::ast_id_map_query)] #[salsa::invoke(crate::source_id::AstIdMap::ast_id_map_query)]
fn ast_id_map(&self, file_id: HirFileId) -> Arc<AstIdMap>; fn ast_id_map(&self, file_id: HirFileId) -> Arc<AstIdMap>;
#[salsa::invoke(crate::source_id::AstIdMap::ast_id_to_node_query)] #[salsa::invoke(crate::source_id::AstIdMap::file_item_query)]
fn ast_id_to_node(&self, file_id: HirFileId, ast_id: ErasedFileAstId) -> TreeArc<SyntaxNode>; fn ast_id_to_node(&self, file_id: HirFileId, ast_id: ErasedFileAstId) -> TreeArc<SyntaxNode>;
#[salsa::invoke(RawItems::raw_items_query)] #[salsa::invoke(RawItems::raw_items_query)]

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

@ -92,7 +92,7 @@ impl AstIdMap {
Arc::new(AstIdMap::from_source_file(&source_file)) Arc::new(AstIdMap::from_source_file(&source_file))
} }
pub(crate) fn ast_id_to_node_query( pub(crate) fn file_item_query(
db: &impl DefDatabase, db: &impl DefDatabase,
file_id: HirFileId, file_id: HirFileId,
ast_id: ErasedFileAstId, ast_id: ErasedFileAstId,

2
crates/ra_syntax/src/grammar.ron
View file

@ -674,7 +674,7 @@ Grammar(
"LifetimeArg": (), "LifetimeArg": (),
"MacroItems": ( "MacroItems": (
traits: [ "ModuleItemOwner", "FnDefOwner" ], traits: [ "ModuleItemOwner", "FnDefOwner" ],
), ),
"MacroStmts" : ( "MacroStmts" : (