about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-16 13:11:23 -0700
committerbors <bors@rust-lang.org>2014-05-16 13:11:23 -0700
commit5e10686aabb7253e6a6e660e72c7f5de8bbba3de (patch)
treec9201890e56ad79f87fdefd95f1f332d91fffa75 /src/libsyntax/parse
parent25c54226c3e7dd6f59cf2e92238a4d79d8b0128d (diff)
parentb84c0dc2d695c99b64653d125c367fce2ae591c4 (diff)
downloadrust-5e10686aabb7253e6a6e660e72c7f5de8bbba3de.tar.gz
rust-5e10686aabb7253e6a6e660e72c7f5de8bbba3de.zip
auto merge of #14233 : pcwalton/rust/detildestr-morelibs, r=alexcrichton
r? @alexcrichton
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/token.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 5dfd18392a9..8758f109042 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -606,7 +606,8 @@ impl<'a> Equiv<&'a str> for InternedString {
 
 impl<D:Decoder<E>, E> Decodable<D, E> for InternedString {
     fn decode(d: &mut D) -> Result<InternedString, E> {
-        Ok(get_name(get_ident_interner().intern(try!(d.read_str()))))
+        Ok(get_name(get_ident_interner().intern(
+                    try!(d.read_str()).as_slice())))
     }
 }