diff options
| author | Edwin Cheng <[email protected]> | 2019-05-03 14:38:00 +0100 |
|---|---|---|
| committer | Edwin Cheng <[email protected]> | 2019-05-03 14:38:00 +0100 |
| commit | e8e46100d6c2ae617e1321bb01ce5a2f3cb37c6a (patch) | |
| tree | 37c14a32bb38f2ed716c55860bf3f60240207abc /crates/ra_mbe/src/mbe_expander.rs | |
| parent | b29f442c8b8601feec4dbc49f121801b153d83e1 (diff) | |
Refactor out tests module and remove empty subtree
Diffstat (limited to 'crates/ra_mbe/src/mbe_expander.rs')
| -rw-r--r-- | crates/ra_mbe/src/mbe_expander.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs index 361b1e404..1453a106d 100644 --- a/crates/ra_mbe/src/mbe_expander.rs +++ b/crates/ra_mbe/src/mbe_expander.rs | |||
| @@ -329,6 +329,14 @@ fn expand_subtree( | |||
| 329 | .token_trees | 329 | .token_trees |
| 330 | .iter() | 330 | .iter() |
| 331 | .map(|it| expand_tt(it, ctx)) | 331 | .map(|it| expand_tt(it, ctx)) |
| 332 | .filter(|it| { | ||
| 333 | // Filter empty subtree | ||
| 334 | if let Ok(tt::TokenTree::Subtree(subtree)) = it { | ||
| 335 | subtree.delimiter != tt::Delimiter::None || !subtree.token_trees.is_empty() | ||
| 336 | } else { | ||
| 337 | true | ||
| 338 | } | ||
| 339 | }) | ||
| 332 | .collect::<Result<Vec<_>, ExpandError>>()?; | 340 | .collect::<Result<Vec<_>, ExpandError>>()?; |
| 333 | 341 | ||
| 334 | Ok(tt::Subtree { token_trees, delimiter: template.delimiter }) | 342 | Ok(tt::Subtree { token_trees, delimiter: template.delimiter }) |