diff options
| author | Adolfo OchagavĂa <aochagavia92@gmail.com> | 2014-07-10 18:21:16 +0200 |
|---|---|---|
| committer | Adolfo OchagavĂa <aochagavia92@gmail.com> | 2014-07-15 19:55:21 +0200 |
| commit | c6b82c7566a2e1da7d0f1697335b47c8c999720e (patch) | |
| tree | e2d131432e0f2ad7d1fe56a846feeab03df1791a /src/libstd/io | |
| parent | 1900abdd9b5b5eef5d90b43555c1ae06743e50db (diff) | |
| download | rust-c6b82c7566a2e1da7d0f1697335b47c8c999720e.tar.gz rust-c6b82c7566a2e1da7d0f1697335b47c8c999720e.zip | |
Deprecate `str::from_utf8_lossy`
Use `String::from_utf8_lossy` instead [breaking-change]
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/process.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index bc0140a358c..1f18200f5aa 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -313,7 +313,6 @@ impl Command { /// /// ``` /// use std::io::Command; - /// use std::str; /// /// let output = match Command::new("cat").arg("foot.txt").output() { /// Ok(output) => output, @@ -321,8 +320,8 @@ impl Command { /// }; /// /// println!("status: {}", output.status); - /// println!("stdout: {}", str::from_utf8_lossy(output.output.as_slice())); - /// println!("stderr: {}", str::from_utf8_lossy(output.error.as_slice())); + /// println!("stdout: {}", String::from_utf8_lossy(output.output.as_slice())); + /// println!("stderr: {}", String::from_utf8_lossy(output.error.as_slice())); /// ``` pub fn output(&self) -> IoResult<ProcessOutput> { self.spawn().and_then(|p| p.wait_with_output()) @@ -353,9 +352,9 @@ impl fmt::Show for Command { /// non-utf8 data is lossily converted using the utf8 replacement /// character. fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "{}", str::from_utf8_lossy(self.program.as_bytes_no_nul()))); + try!(write!(f, "{}", String::from_utf8_lossy(self.program.as_bytes_no_nul()))); for arg in self.args.iter() { - try!(write!(f, " '{}'", str::from_utf8_lossy(arg.as_bytes_no_nul()))); + try!(write!(f, " '{}'", String::from_utf8_lossy(arg.as_bytes_no_nul()))); } Ok(()) } @@ -903,7 +902,7 @@ mod tests { let new_env = vec![("RUN_TEST_NEW_ENV", "123")]; let prog = env_cmd().env_set_all(new_env.as_slice()).spawn().unwrap(); let result = prog.wait_with_output().unwrap(); - let output = str::from_utf8_lossy(result.output.as_slice()).into_string(); + let output = String::from_utf8_lossy(result.output.as_slice()).into_string(); assert!(output.as_slice().contains("RUN_TEST_NEW_ENV=123"), "didn't find RUN_TEST_NEW_ENV inside of:\n\n{}", output); |
