language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use arrayvec 0.6

Browse source
This commit is contained in:
Laurențiu Nicola 2021-03-25 21:03:20 +02:00
parent 59fdd7c84c
commit 9787bddac5
8 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/syntax/src/ast/edit.rs
View file

@ -32,7 +32,7 @@ impl ast::BinExpr {
impl ast::Fn {
#[must_use]
pub fn with_body(&self, body: ast::BlockExpr) -> ast::Fn {
let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
let mut to_insert: ArrayVec<SyntaxElement, 2> = ArrayVec::new();
let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
old_body.syntax().clone().into()
} else if let Some(semi) = self.semicolon_token() {
@ -55,7 +55,7 @@ impl ast::Fn {
let anchor = self.name().expect("The function must have a name").syntax().clone();
let mut to_insert: ArrayVec<[SyntaxElement; 1]> = ArrayVec::new();
let mut to_insert: ArrayVec<SyntaxElement, 1> = ArrayVec::new();
to_insert.push(generic_args.syntax().clone().into());
self.insert_children(InsertPosition::After(anchor.into()), to_insert)
}
@ -96,7 +96,7 @@ where
impl ast::Impl {
#[must_use]
pub fn with_assoc_item_list(&self, items: ast::AssocItemList) -> ast::Impl {
let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
let mut to_insert: ArrayVec<SyntaxElement, 2> = ArrayVec::new();
if let Some(old_items) = self.assoc_item_list() {
let to_replace: SyntaxElement = old_items.syntax().clone().into();
to_insert.push(items.syntax().clone().into());
@ -141,7 +141,7 @@ impl ast::AssocItemList {
},
};
let ws = tokens::WsBuilder::new(&format!("{}{}", whitespace, indent));
let to_insert: ArrayVec<[SyntaxElement; 2]> =
let to_insert: ArrayVec<SyntaxElement, 2> =
[ws.ws().into(), item.syntax().clone().into()].into();
self.insert_children(position, to_insert)
}
@ -192,7 +192,7 @@ impl ast::RecordExprFieldList {
tokens::single_space()
};
let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new();
let mut to_insert: ArrayVec<SyntaxElement, 4> = ArrayVec::new();
to_insert.push(space.into());
to_insert.push(field.syntax().clone().into());
to_insert.push(make::token(T![,]).into());
@ -305,7 +305,7 @@ impl ast::PathSegment {
iter::once(type_args.syntax().clone().into()),
);
}
let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
let mut to_insert: ArrayVec<SyntaxElement, 2> = ArrayVec::new();
if turbo {
to_insert.push(make::token(T![::]).into());
}
@ -444,7 +444,7 @@ impl ast::MatchArmList {
let arm_ws = tokens::WsBuilder::new(" ");
let match_indent = &leading_indent(self.syntax()).unwrap_or_default();
let match_ws = tokens::WsBuilder::new(&format!("\n{}", match_indent));
let to_insert: ArrayVec<[SyntaxElement; 3]> =
let to_insert: ArrayVec<SyntaxElement, 3> =
[arm_ws.ws().into(), item.syntax().clone().into(), match_ws.ws().into()].into();
self.insert_children(position, to_insert)
}
@ -465,7 +465,7 @@ impl ast::GenericParamList {
pub fn append_param(&self, item: ast::GenericParam) -> ast::GenericParamList {
let space = tokens::single_space();
let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new();
let mut to_insert: ArrayVec<SyntaxElement, 4> = ArrayVec::new();
if self.generic_params().next().is_some() {
to_insert.push(space.into());
}