language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move TokenStream::to_string helpers inside the method

Browse source
This commit is contained in:
Kevin Mehall 2021-03-06 12:30:43 -07:00
parent 93c9b34635
commit aea9749390
1 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/proc_macro_srv/src/rustc_server.rs
View file

@ -199,14 +199,16 @@ pub mod token_stream {
impl ToString for TokenStream { impl ToString for TokenStream {
fn to_string(&self) -> String { fn to_string(&self) -> String {
tokentrees_to_text(&self.token_trees[..]) return tokentrees_to_text(&self.token_trees[..]);
}
}
fn tokentrees_to_text(tkns: &[tt::TokenTree]) -> String { fn tokentrees_to_text(tkns: &[tt::TokenTree]) -> String {
tkns.iter() tkns.iter()
.fold((String::new(), true), |(last, last_to_joint), tkn| { .fold((String::new(), true), |(last, last_to_joint), tkn| {
let s = [last, tokentree_to_text(tkn)].join(if last_to_joint { "" } else { " " }); let s = [last, tokentree_to_text(tkn)].join(if last_to_joint {
""
} else {
" "
});
let mut is_joint = false; let mut is_joint = false;
if let tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) = tkn { if let tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) = tkn {
if punct.spacing == tt::Spacing::Joint { if punct.spacing == tt::Spacing::Joint {
@ -235,6 +237,8 @@ pub mod token_stream {
} }
} }
} }
}
}
fn subtree_replace_token_ids_with_unspecified(subtree: tt::Subtree) -> tt::Subtree { fn subtree_replace_token_ids_with_unspecified(subtree: tt::Subtree) -> tt::Subtree {
tt::Subtree { tt::Subtree {