itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-12-27 16:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge rust-analyzer/smol_str#16

Browse Source 
16: Improve `Arc<str>` creation r=matklad a=sinkuu

While using `Into<String>` could avoid an allocation in `str` -> `String`,
converting `Box<str>` into `Arc<str>` [deallocates it and allocates new](https://doc.rust-lang.org/1.40.0/src/alloc/sync.rs.html#778-796) anyway.

The 1st commit is a drive-by simplification.

Co-authored-by: Shotaro Yamada <sinkuu@sinkuu.xyz>
This commit is contained in:
bors[bot] 2020-01-09 16:07:08 +00:00 committed by GitHub
commit 402fbec386
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/smol_str/src/lib.rs
View File

@ -104,7 +104,7 @@ impl SmolStr {
pub fn new<T>(text: T) -> SmolStr
where
T: Into<String> + AsRef<str>,
T: AsRef<str>,
{
SmolStr(Repr::new(text))
}
@ -343,7 +343,7 @@ enum Repr {
impl Repr {
fn new<T>(text: T) -> Self
where
T: Into<String> + AsRef<str>,
T: AsRef<str>,
{
{
let text = text.as_ref();
@ -359,13 +359,15 @@ impl Repr {
}
let newlines = text.bytes().take_while(|&b| b == b'\n').count();
let spaces = text[newlines..].bytes().take_while(|&b| b == b' ').count();
if newlines + spaces == len && newlines <= N_NEWLINES && spaces <= N_SPACES {
return Repr::Substring { newlines, spaces };
if text[newlines..].bytes().all(|b| b == b' ') {
let spaces = len - newlines;
if newlines <= N_NEWLINES && spaces <= N_SPACES {
return Repr::Substring { newlines, spaces };
}
}
}
Repr::Heap(text.into().into_boxed_str().into())
Repr::Heap(text.as_ref().into())
}
#[inline(always)]