diff options
| author | Steven Fackler <sfackler@gmail.com> | 2014-03-26 09:24:16 -0700 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2014-04-06 15:39:56 -0700 |
| commit | d0e60b72ee3f5fb07b01143d82362cb42307f32d (patch) | |
| tree | ed0161843da862f7b40a01b76a81ced97c1e67da /src/libserialize | |
| parent | 94a055c7295bd5822219b86243c2af6fff9d21d3 (diff) | |
| download | rust-d0e60b72ee3f5fb07b01143d82362cb42307f32d.tar.gz rust-d0e60b72ee3f5fb07b01143d82362cb42307f32d.zip | |
De-~[] Reader and Writer
There's a little more allocation here and there now since from_utf8_owned can't be used with Vec.
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 2d3e6bc86eb..34e2cbeb15e 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1282,8 +1282,8 @@ pub fn from_reader(rdr: &mut io::Reader) -> DecodeResult<Json> { Ok(c) => c, Err(e) => return Err(IoError(e)) }; - let s = match str::from_utf8_owned(contents) { - Some(s) => s, + let s = match str::from_utf8(contents.as_slice()) { + Some(s) => s.to_owned(), None => return Err(ParseError(~"contents not utf-8", 0, 0)) }; let mut parser = Parser::new(s.chars()); |
