diff options
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 86ab2e099d0..22ece367b80 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -351,7 +351,7 @@ pub fn gather_comments_and_literals(span_diagnostic: path: @str, srdr: &mut io::Reader) -> (~[Comment], ~[Literal]) { - let src = str::from_utf8_owned(srdr.read_to_end()).to_managed(); + let src = str::from_utf8_owned(srdr.read_to_end()).unwrap().to_managed(); let cm = CodeMap::new(); let filemap = cm.new_filemap(path, src); let rdr = lexer::new_low_level_string_reader(span_diagnostic, filemap); diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index b1a80878cf1..9713f331147 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -246,7 +246,7 @@ pub fn file_to_filemap(sess: @ParseSess, path: &Path, spanopt: Option<Span>) unreachable!() } }; - match str::from_utf8_owned_opt(bytes) { + match str::from_utf8_owned(bytes) { Some(s) => { return string_to_filemap(sess, s.to_managed(), path.as_str().unwrap().to_managed()); @@ -315,7 +315,7 @@ mod test { let mut writer = MemWriter::new(); let mut encoder = extra::json::Encoder::new(&mut writer as &mut io::Writer); val.encode(&mut encoder); - str::from_utf8_owned(writer.unwrap()) + str::from_utf8_owned(writer.unwrap()).unwrap() } // produce a codemap::span |