diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/format.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index edcb8c32ecc..e7f892d77ce 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -106,7 +106,7 @@ impl<S: Encoder<E>, E> Encodable<S, E> for Ident { impl<D:Decoder<E>, E> Decodable<D, E> for Ident { fn decode(d: &mut D) -> Result<Ident, E> { - Ok(str_to_ident(try!(d.read_str()))) + Ok(str_to_ident(try!(d.read_str()).as_slice())) } } diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index e92ce139d00..01124fdfa54 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -886,7 +886,9 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, sp: Span, } match parser.errors.shift() { Some(error) => { - cx.ecx.span_err(efmt.span, "invalid format string: " + error); + cx.ecx.span_err(efmt.span, + format_strbuf!("invalid format string: {}", + error).as_slice()); return DummyResult::raw_expr(sp); } None => {} 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()))) } } |