Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #6648

Browse source 
6648: Avoid allocation in ast::String::value if the string needs no unescaping r=lnicola a=Veykril



Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2020-11-27 11:14:14 +00:00 committed by GitHub
commit c66d477f5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
crates/syntax/src/ast/token_ext.rs
View file

@ -130,19 +130,28 @@ impl ast::String {
let text = self.text().as_str(); let text = self.text().as_str();
let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()]; let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
let mut buf = String::with_capacity(text.len()); let mut buf = String::new();
let mut text_iter = text.chars();
let mut has_error = false; let mut has_error = false;
unescape_literal(text, Mode::Str, &mut |_, unescaped_char| match unescaped_char { unescape_literal(text, Mode::Str, &mut |char_range, unescaped_char| match (
Ok(c) => buf.push(c), unescaped_char,
Err(_) => has_error = true, buf.capacity() == 0,
) {
(Ok(c), false) => buf.push(c),
(Ok(c), true) if Some(c) == text_iter.next() => (),
(Ok(c), true) => {
buf.reserve_exact(text.len());
buf.push_str(&text[..char_range.start]);
buf.push(c);
}
(Err(_), _) => has_error = true,
}); });
if has_error { match (has_error, buf.capacity() == 0) {
return None; (true, _) => None,
(false, true) => Some(Cow::Borrowed(text)),
(false, false) => Some(Cow::Owned(buf)),
} }
// FIXME: don't actually allocate for borrowed case
let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };
Some(res)
} }
pub fn quote_offsets(&self) -> Option<QuoteOffsets> { pub fn quote_offsets(&self) -> Option<QuoteOffsets> {