bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/mbe/src/syntax_bridge.rs')
-rw-r--r--crates/mbe/src/syntax_bridge.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs
index 8b57d7eeaf..d6c3bd1892 100644
--- a/crates/mbe/src/syntax_bridge.rs
+++ b/crates/mbe/src/syntax_bridge.rs
@@ -234,7 +234,7 @@ where
let mut stack = NonEmptyVec::new(entry);
while let Some((token, abs_range)) = conv.bump() {
- let tt::Subtree { delimiter, token_trees: result } = stack.last_mut();
+ let tt::Subtree { delimiter, token_trees } = stack.last_mut();
let tt = match token.as_leaf() {
Some(leaf) => tt::TokenTree::Leaf(leaf.clone()),
@@ -243,7 +243,7 @@ where
COMMENT => {
let span = conv.span_for(abs_range);
if let Some(tokens) = conv.convert_doc_comment(&token, span) {
- result.extend(tokens);
+ token_trees.extend(tokens);
}
continue;
}
@@ -317,7 +317,7 @@ where
span: conv
.span_for(TextRange::at(abs_range.start(), TextSize::of('\''))),
});
- result.push(apostrophe.into());
+ token_trees.push(apostrophe.into());
let ident = tt::Leaf::from(tt::Ident {
text: SmolStr::new(&token.to_text(conv)[1..]),
@@ -326,7 +326,7 @@ where
abs_range.end(),
)),
});
- result.push(ident.into());
+ token_trees.push(ident.into());
continue;
}
_ => continue,
@@ -337,7 +337,7 @@ where
},
};
- result.push(tt);
+ token_trees.push(tt);
}
// If we get here, we've consumed all input tokens.
@@ -622,7 +622,7 @@ where
struct Converter<SpanMap, S> {
current: Option<SyntaxToken>,
- current_leafs: Vec<tt::Leaf<S>>,
+ current_leaves: Vec<tt::Leaf<S>>,
preorder: PreorderWithTokens,
range: TextRange,
punct_offset: Option<(SyntaxToken, TextSize)>,
@@ -650,7 +650,7 @@ impl<SpanMap, S> Converter<SpanMap, S> {
append,
remove,
call_site,
- current_leafs: vec![],
+ current_leaves: vec![],
};
let first = this.next_token();
this.current = first;
@@ -665,7 +665,7 @@ impl<SpanMap, S> Converter<SpanMap, S> {
self.preorder.skip_subtree();
if let Some(mut v) = self.append.remove(&n.into()) {
v.reverse();
- self.current_leafs.extend(v);
+ self.current_leaves.extend(v);
return None;
}
}
@@ -673,7 +673,7 @@ impl<SpanMap, S> Converter<SpanMap, S> {
WalkEvent::Leave(ele) => {
if let Some(mut v) = self.append.remove(&ele) {
v.reverse();
- self.current_leafs.extend(v);
+ self.current_leaves.extend(v);
return None;
}
}
@@ -758,8 +758,8 @@ where
}
}
- if let Some(leaf) = self.current_leafs.pop() {
- if self.current_leafs.is_empty() {
+ if let Some(leaf) = self.current_leaves.pop() {
+ if self.current_leaves.is_empty() {
self.current = self.next_token();
}
return Some((SynToken::Leaf(leaf), TextRange::empty(TextSize::new(0))));