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

Refactor out tests module and remove empty subtree

Browse source
This commit is contained in:
Edwin Cheng 2019-05-03 21:38:00 +08:00
parent b29f442c8b
commit e8e46100d6
3 changed files with 1372 additions and 1137 deletions
Download patch file Download diff file Expand all files Collapse all files

1138
crates/ra_mbe/src/lib.rs
View file

File diff suppressed because it is too large Load diff

8
crates/ra_mbe/src/mbe_expander.rs
View file

@ -329,6 +329,14 @@ fn expand_subtree(
.token_trees .token_trees
.iter() .iter()
.map(|it| expand_tt(it, ctx)) .map(|it| expand_tt(it, ctx))
.filter(|it| {
// Filter empty subtree
if let Ok(tt::TokenTree::Subtree(subtree)) = it {
subtree.delimiter != tt::Delimiter::None || !subtree.token_trees.is_empty()
} else {
true
}
})
.collect::<Result<Vec<_>, ExpandError>>()?; .collect::<Result<Vec<_>, ExpandError>>()?;
Ok(tt::Subtree { token_trees, delimiter: template.delimiter }) Ok(tt::Subtree { token_trees, delimiter: template.delimiter })

1363
crates/ra_mbe/src/tests.rs Normal file
View file

File diff suppressed because it is too large Load diff