about summary refs log tree commit diff
path: root/src/libsyntax/parse/token.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-10-12 10:15:27 -0700
committerAlex Crichton <alex@alexcrichton.com>2016-10-12 14:07:56 -0700
commitf05bd1b41ddda779032f4c5c8e30bf640129832f (patch)
tree20136a8f6a2215e22703c51ba54c78426c3837fe /src/libsyntax/parse/token.rs
parenta0ad6616fc2244eea66c6adadd35f899b170505f (diff)
parentb043e11de2eb2c60f7bfec5e15960f537b229e20 (diff)
downloadrust-f05bd1b41ddda779032f4c5c8e30bf640129832f.tar.gz
rust-f05bd1b41ddda779032f4c5c8e30bf640129832f.zip
Rollup merge of #37064 - nnethercote:read_str, r=eddyb
Avoid allocations in `Decoder::read_str`.

`opaque::Decoder::read_str` is very hot within `rustc` due to its use in
the reading of crate metadata, and it currently returns a `String`. This
commit changes it to instead return a `Cow<str>`, which avoids a heap
allocation.

This change reduces the number of calls to `malloc` by almost 10% in
some benchmarks.

This is a [breaking-change] to libserialize.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
-rw-r--r--src/libsyntax/parse/token.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 09bc5607946..73d9695a990 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -566,7 +566,7 @@ impl PartialEq<InternedString> for str {
 
 impl Decodable for InternedString {
     fn decode<D: Decoder>(d: &mut D) -> Result<InternedString, D::Error> {
-        Ok(intern(d.read_str()?.as_ref()).as_str())
+        Ok(intern(&d.read_str()?).as_str())
     }
 }