From 211f1caa290d83a3e24ad99d53395975a3981014 Mon Sep 17 00:00:00 2001
From: Adolfo Ochagavía <aochagavia92@gmail.com>
Date: Mon, 30 Jun 2014 16:41:30 +0200
Subject: Deprecate `str::from_utf8_owned`

Use `String::from_utf8` instead

[breaking-change]
---
 src/libsyntax/ext/source_util.rs      | 10 +++++-----
 src/libsyntax/parse/lexer/comments.rs |  2 +-
 src/libsyntax/print/pprust.rs         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/libsyntax')

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());
diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs
index 3f3a8a723f1..c53638ed07d 100644
--- a/src/libsyntax/parse/lexer/comments.rs
+++ b/src/libsyntax/parse/lexer/comments.rs
@@ -339,7 +339,7 @@ pub fn gather_comments_and_literals(span_diagnostic: &diagnostic::SpanHandler,
                                     srdr: &mut io::Reader)
                                  -> (Vec<Comment>, Vec<Literal>) {
     let src = srdr.read_to_end().unwrap();
-    let src = str::from_utf8(src.as_slice()).unwrap().to_string();
+    let src = String::from_utf8(src).unwrap();
     let cm = CodeMap::new();
     let filemap = cm.new_filemap(path, src);
     let mut rdr = lexer::StringReader::new_raw(span_diagnostic, filemap);
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 615a4489a73..c8e7806670e 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -138,7 +138,7 @@ pub fn to_string(f: |&mut State| -> IoResult<()>) -> String {
         // downcasts.
         let (_, wr): (uint, Box<MemWriter>) = mem::transmute_copy(&s.s.out);
         let result =
-            str::from_utf8_owned(Vec::from_slice(wr.get_ref())).unwrap();
+            String::from_utf8(Vec::from_slice(wr.get_ref())).unwrap();
         mem::forget(wr);
         result.to_string()
     }
-- 
cgit 1.4.1-3-g733a5