bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make TokenTree::uninterpolate take &self and return a Cow.

Browse source 
Making it similar to `Token::uninterpolate`. This avoids some more token
tree cloning.
This commit is contained in:
Nicholas Nethercote 2023-07-27 10:10:32 +10:00
parent 103bd4a820
commit 55a732461d
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_ast/src/tokenstream.rs
View file

@ -25,6 +25,7 @@ use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
use rustc_span::{Span, DUMMY_SP};
use smallvec::{smallvec, SmallVec};
use std::borrow::Cow;
use std::{fmt, iter, mem};
/// When the main Rust parser encounters a syntax-extension invocation, it
@ -98,12 +99,13 @@ impl TokenTree {
TokenTree::Token(Token::new(kind, span), Spacing::Joint)
}
pub fn uninterpolate(self) -> TokenTree {
pub fn uninterpolate(&self) -> Cow<'_, TokenTree> {
match self {
TokenTree::Token(token, spacing) => {
TokenTree::Token(token.uninterpolate().into_owned(), spacing)
}
tt => tt,
TokenTree::Token(token, spacing) => match token.uninterpolate() {
Cow::Owned(token) => Cow::Owned(TokenTree::Token(token, *spacing)),
Cow::Borrowed(_) => Cow::Borrowed(self),
},
_ => Cow::Borrowed(self),
}
}
}