From 2aa7e552f730e89b3752ea372f7a3ee13d3ca0c8 Mon Sep 17 00:00:00 2001
From: Heather <heather@cynede.net>
Date: Fri, 6 Dec 2013 09:31:49 +0400
Subject: [PATCH] init -> new (reverted in rust) from_utf8_slice -> from_utf8

---
 cat/cat.rs         | 2 +-
 dirname/dirname.rs | 4 ++--
 wc/wc.rs           | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cat/cat.rs b/cat/cat.rs
index 05ab62f5a..aa7f60c20 100644
--- a/cat/cat.rs
+++ b/cat/cat.rs
@@ -182,7 +182,7 @@ fn open(path: ~str) -> Option<~Reader> {
         return Some(~stdin() as ~Reader);
     }
 
-    match result(|| File::open(&std::path::Path::init(path.as_slice()))) {
+    match result(|| File::open(&std::path::Path::new(path.as_slice()))) {
         Ok(fd) => return Some(~fd as ~Reader),
         Err(e) => {
             writeln!(&mut stderr() as &mut Writer,
diff --git a/dirname/dirname.rs b/dirname/dirname.rs
index e6e8222ed..f08d67cb5 100644
--- a/dirname/dirname.rs
+++ b/dirname/dirname.rs
@@ -59,8 +59,8 @@ directory).", opts));
 
     if !matches.free.is_empty() {
         for path in matches.free.iter() {
-            let p = std::path::Path::init(path.clone());
-            print(std::str::from_utf8_slice(p.dirname()));
+            let p = std::path::Path::new(path.clone());
+            print(std::str::from_utf8(p.dirname()));
             print(separator);
         }
     } else {
diff --git a/wc/wc.rs b/wc/wc.rs
index 70f9cec50..ed346b61a 100644
--- a/wc/wc.rs
+++ b/wc/wc.rs
@@ -14,7 +14,7 @@ extern mod extra;
 use std::os;
 use std::io::{stdin, stderr, File, result};
 use std::io::buffered::BufferedReader;
-use std::str::from_utf8_slice_opt;
+use std::str::from_utf8_opt;
 use extra::getopts::{groups, Matches};
 
 struct Result {
@@ -119,7 +119,7 @@ pub fn wc(files: ~[~str], matches: &Matches) {
                     byte_count += raw_line.iter().len();
 
                     // try and convert the bytes to UTF-8 first
-                    match from_utf8_slice_opt(raw_line) {
+                    match from_utf8_opt(raw_line) {
                         Some(line) => {
                             word_count += line.words().len();
                             current_char_count = line.chars().len();
@@ -221,7 +221,7 @@ fn open(path: ~str) -> Option<BufferedReader<~Reader>> {
         return Some(BufferedReader::new(reader));
     }
 
-    match result(|| File::open(&std::path::Path::init(path.as_slice()))) {
+    match result(|| File::open(&std::path::Path::new(path.as_slice()))) {
         Ok(fd) => {
             let reader = ~fd as ~Reader;
             return Some(BufferedReader::new(reader));