Deprecate `str::from_utf8_owned`

Use `String::from_utf8` instead

[breaking-change]

1 files changed, 5 insertions, 5 deletions

diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index 5ac9dc86fce..244be0854bf 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -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());