bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/mbe/src/benchmark.rs')
-rw-r--r--crates/mbe/src/benchmark.rs45
1 files changed, 21 insertions, 24 deletions
diff --git a/crates/mbe/src/benchmark.rs b/crates/mbe/src/benchmark.rs
index 9d43e13045..19cb20354b 100644
--- a/crates/mbe/src/benchmark.rs
+++ b/crates/mbe/src/benchmark.rs
@@ -6,10 +6,11 @@ use syntax::{
AstNode, SmolStr,
};
use test_utils::{bench, bench_fixture, skip_slow_tests};
+use tt::{Span, TokenId};
use crate::{
parser::{MetaVarKind, Op, RepeatKind, Separator},
- syntax_node_to_token_tree, tt, DeclarativeMacro,
+ syntax_node_to_token_tree, DeclarativeMacro,
};
#[test]
@@ -54,7 +55,7 @@ fn macro_rules_fixtures() -> FxHashMap<String, DeclarativeMacro> {
.collect()
}
-fn macro_rules_fixtures_tt() -> FxHashMap<String, tt::Subtree> {
+fn macro_rules_fixtures_tt() -> FxHashMap<String, tt::Subtree<TokenId>> {
let fixture = bench_fixture::numerous_macro_rules();
let source_file = ast::SourceFile::parse(&fixture).ok().unwrap();
@@ -71,7 +72,9 @@ fn macro_rules_fixtures_tt() -> FxHashMap<String, tt::Subtree> {
}
/// Generate random invocation fixtures from rules
-fn invocation_fixtures(rules: &FxHashMap<String, DeclarativeMacro>) -> Vec<(String, tt::Subtree)> {
+fn invocation_fixtures(
+ rules: &FxHashMap<String, DeclarativeMacro>,
+) -> Vec<(String, tt::Subtree<TokenId>)> {
let mut seed = 123456789;
let mut res = Vec::new();
@@ -93,8 +96,8 @@ fn invocation_fixtures(rules: &FxHashMap<String, DeclarativeMacro>) -> Vec<(Stri
loop {
let mut subtree = tt::Subtree {
delimiter: tt::Delimiter {
- open: tt::TokenId::UNSPECIFIED,
- close: tt::TokenId::UNSPECIFIED,
+ open: tt::TokenId::DUMMY,
+ close: tt::TokenId::DUMMY,
kind: tt::DelimiterKind::Invisible,
},
token_trees: vec![],
@@ -116,7 +119,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, DeclarativeMacro>) -> Vec<(Stri
}
return res;
- fn collect_from_op(op: &Op, parent: &mut tt::Subtree, seed: &mut usize) {
+ fn collect_from_op(op: &Op<TokenId>, parent: &mut tt::Subtree<TokenId>, seed: &mut usize) {
return match op {
Op::Var { kind, .. } => match kind.as_ref() {
Some(MetaVarKind::Ident) => parent.token_trees.push(make_ident("foo")),
@@ -202,36 +205,30 @@ fn invocation_fixtures(rules: &FxHashMap<String, DeclarativeMacro>) -> Vec<(Stri
*seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c);
*seed
}
- fn make_ident(ident: &str) -> tt::TokenTree {
- tt::Leaf::Ident(tt::Ident {
- span: tt::TokenId::unspecified(),
- text: SmolStr::new(ident),
- })
- .into()
+ fn make_ident(ident: &str) -> tt::TokenTree<TokenId> {
+ tt::Leaf::Ident(tt::Ident { span: tt::TokenId::DUMMY, text: SmolStr::new(ident) })
+ .into()
}
- fn make_punct(char: char) -> tt::TokenTree {
+ fn make_punct(char: char) -> tt::TokenTree<TokenId> {
tt::Leaf::Punct(tt::Punct {
- span: tt::TokenId::unspecified(),
+ span: tt::TokenId::DUMMY,
char,
spacing: tt::Spacing::Alone,
})
.into()
}
- fn make_literal(lit: &str) -> tt::TokenTree {
- tt::Leaf::Literal(tt::Literal {
- span: tt::TokenId::unspecified(),
- text: SmolStr::new(lit),
- })
- .into()
+ fn make_literal(lit: &str) -> tt::TokenTree<TokenId> {
+ tt::Leaf::Literal(tt::Literal { span: tt::TokenId::DUMMY, text: SmolStr::new(lit) })
+ .into()
}
fn make_subtree(
kind: tt::DelimiterKind,
- token_trees: Option<Vec<tt::TokenTree>>,
- ) -> tt::TokenTree {
+ token_trees: Option<Vec<tt::TokenTree<TokenId>>>,
+ ) -> tt::TokenTree<TokenId> {
tt::Subtree {
delimiter: tt::Delimiter {
- open: tt::TokenId::unspecified(),
- close: tt::TokenId::unspecified(),
+ open: tt::TokenId::DUMMY,
+ close: tt::TokenId::DUMMY,
kind,
},
token_trees: token_trees.unwrap_or_default(),