diff options
| author | bors <bors@rust-lang.org> | 2013-12-04 11:32:23 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-04 11:32:23 -0800 |
| commit | 9b9cf9892b74dc376fe740ea56858042e9bd89de (patch) | |
| tree | 0453cef98715b1efed5b3baed3d0481eb474f09c /src/libsyntax/parse | |
| parent | 5fa6bd526ef66ce9ce80e975340aa98bcc3596b7 (diff) | |
| parent | b0426edc0a83699de79ceffcbe603812b9b53374 (diff) | |
| download | rust-9b9cf9892b74dc376fe740ea56858042e9bd89de.tar.gz rust-9b9cf9892b74dc376fe740ea56858042e9bd89de.zip | |
auto merge of #10701 : huonw/rust/rm-from_utf8, r=brson
This function had type &[u8] -> ~str, i.e. it allocates a string internally, even though the non-allocating version that take &[u8] -> &str and ~[u8] -> ~str are all that is necessary in most circumstances.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index d8f2d8a5380..0704bf913d7 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -346,7 +346,7 @@ pub fn gather_comments_and_literals(span_diagnostic: path: @str, srdr: &mut io::Reader) -> (~[cmnt], ~[lit]) { - let src = str::from_utf8(srdr.read_to_end()).to_managed(); + let src = str::from_utf8_owned(srdr.read_to_end()).to_managed(); let cm = CodeMap::new(); let filemap = cm.new_filemap(path, src); let rdr = lexer::new_low_level_string_reader(span_diagnostic, filemap); |