bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Deprecate str::from_utf8_owned

Browse source 
Use `String::from_utf8` instead

[breaking-change]
This commit is contained in:
Adolfo Ochagavía 2014-06-30 16:41:30 +02:00
parent 1704ebb798
commit 211f1caa29
28 changed files with 80 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libsyntax/ext/source_util.rs
View file

@ -122,17 +122,17 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
}
Ok(bytes) => bytes,
};
match str::from_utf8(bytes.as_slice()) {
Some(src) => {
match String::from_utf8(bytes) {
Ok(src) => {
// Add this input file to the code map to make it available as
// dependency information
let filename = file.display().to_string();
let interned = token::intern_and_get_ident(src);
cx.codemap().new_filemap(filename, src.to_string());
let interned = token::intern_and_get_ident(src.as_slice());
cx.codemap().new_filemap(filename, src);
base::MacExpr::new(cx.expr_str(sp, interned))
}
None => {
Err(_) => {
cx.span_err(sp,
format!("{} wasn't a utf-8 file",
file.display()).as_slice());