summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-09 21:02:50 +0000
committerbors <bors@rust-lang.org>2015-03-09 21:02:50 +0000
commitb83b26bacb6371173cdec6bf68c7ffa69f858c84 (patch)
tree5657bd41b93f00786469b3fade19ff617c14c673 /src/libcore
parent638832e64cc62ec46721161ca19731ba00d4da58 (diff)
parent7981aa6ac9165b0bb1a5f624b8802192b8ebc9ee (diff)
downloadrust-b83b26bacb6371173cdec6bf68c7ffa69f858c84.tar.gz
rust-b83b26bacb6371173cdec6bf68c7ffa69f858c84.zip
Auto merge of #22561 - richo:as_slice-as_str, r=Manishearth
This may not be quite ready to go out, I fixed some docs but suspect I missed a bunch.

I also wound up fixing a bunch of redundant `[]` suffixes, but on closer inspection I don't believe that can land until after a snapshot.
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/result.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index b8271562d2e..6c3afdf8849 100644
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -178,13 +178,13 @@
 //! fn write_info(info: &Info) -> Result<(), IoError> {
 //!     let mut file = File::open_mode(&Path::new("my_best_friends.txt"), Open, Write);
 //!     // Early return on error
-//!     if let Err(e) = file.write_line(format!("name: {}", info.name).as_slice()) {
+//!     if let Err(e) = file.write_line(&format!("name: {}", info.name)) {
 //!         return Err(e)
 //!     }
-//!     if let Err(e) = file.write_line(format!("age: {}", info.age).as_slice()) {
+//!     if let Err(e) = file.write_line(&format!("age: {}", info.age)) {
 //!         return Err(e)
 //!     }
-//!     return file.write_line(format!("rating: {}", info.rating).as_slice());
+//!     return file.write_line(&format!("rating: {}", info.rating));
 //! }
 //! ```
 //!
@@ -202,9 +202,9 @@
 //! fn write_info(info: &Info) -> Result<(), IoError> {
 //!     let mut file = File::open_mode(&Path::new("my_best_friends.txt"), Open, Write);
 //!     // Early return on error
-//!     try!(file.write_line(format!("name: {}", info.name).as_slice()));
-//!     try!(file.write_line(format!("age: {}", info.age).as_slice()));
-//!     try!(file.write_line(format!("rating: {}", info.rating).as_slice()));
+//!     try!(file.write_line(&format!("name: {}", info.name)));
+//!     try!(file.write_line(&format!("age: {}", info.age)));
+//!     try!(file.write_line(&format!("rating: {}", info.rating)));
 //!     return Ok(());
 //! }
 //! ```