diff --git a/src/doc/style/errors/ergonomics.md b/src/doc/style/errors/ergonomics.md index 33f1e82b187..d2fcf27e93c 100644 --- a/src/doc/style/errors/ergonomics.md +++ b/src/doc/style/errors/ergonomics.md @@ -22,9 +22,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(()); } ``` @@ -44,15 +44,15 @@ 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 - match file.write_line(format!("name: {}", info.name).as_slice()) { + match file.write_line(&format!("name: {}", info.name)) { Ok(_) => (), Err(e) => return Err(e) } - match file.write_line(format!("age: {}", info.age).as_slice()) { + match file.write_line(&format!("age: {}", info.age)) { Ok(_) => (), Err(e) => return Err(e) } - return file.write_line(format!("rating: {}", info.rating).as_slice()); + return file.write_line(&format!("rating: {}", info.rating)); } ``` diff --git a/src/libcollections/fmt.rs b/src/libcollections/fmt.rs index c88be80679d..15a66bd80d0 100644 --- a/src/libcollections/fmt.rs +++ b/src/libcollections/fmt.rs @@ -198,7 +198,7 @@ //! // for details, and the function `pad` can be used to pad strings. //! let decimals = f.precision().unwrap_or(3); //! let string = f64::to_str_exact(magnitude, decimals); -//! f.pad_integral(true, "", string.as_slice()) +//! f.pad_integral(true, "", &string) //! } //! } //! diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index d6ec8f0d979..051fa1a8612 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -139,7 +139,7 @@ impl String { /// ```rust /// let input = b"Hello \xF0\x90\x80World"; /// let output = String::from_utf8_lossy(input); - /// assert_eq!(output.as_slice(), "Hello \u{FFFD}World"); + /// assert_eq!(output, "Hello \u{FFFD}World"); /// ``` #[stable(feature = "rust1", since = "1.0.0")] pub fn from_utf8_lossy<'a>(v: &'a [u8]) -> Cow<'a, str> { @@ -355,7 +355,7 @@ impl String { /// ``` /// let mut s = String::from_str("foo"); /// s.push_str("bar"); - /// assert_eq!(s.as_slice(), "foobar"); + /// assert_eq!(s, "foobar"); /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] @@ -450,7 +450,7 @@ impl String { /// s.push('1'); /// s.push('2'); /// s.push('3'); - /// assert_eq!(s.as_slice(), "abc123"); + /// assert_eq!(s, "abc123"); /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] @@ -503,7 +503,7 @@ impl String { /// ``` /// let mut s = String::from_str("hello"); /// s.truncate(2); - /// assert_eq!(s.as_slice(), "he"); + /// assert_eq!(s, "he"); /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] @@ -622,7 +622,7 @@ impl String { /// assert!(vec == &[104, 101, 108, 108, 111]); /// vec.reverse(); /// } - /// assert_eq!(s.as_slice(), "olleh"); + /// assert_eq!(s, "olleh"); /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] 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(()); //! } //! ``` diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 617edb4bea6..38abf3881bd 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -46,7 +46,7 @@ //! //! fn print_usage(program: &str, opts: &[OptGroup]) { //! let brief = format!("Usage: {} [options]", program); -//! print!("{}", usage(brief.as_slice(), opts)); +//! print!("{}", usage(brief, opts)); //! } //! //! fn main() { @@ -63,17 +63,17 @@ //! Err(f) => { panic!(f.to_string()) } //! }; //! if matches.opt_present("h") { -//! print_usage(program.as_slice(), opts); +//! print_usage(program, opts); //! return; //! } //! let output = matches.opt_str("o"); //! let input = if !matches.free.is_empty() { //! matches.free[0].clone() //! } else { -//! print_usage(program.as_slice(), opts); +//! print_usage(program, opts); //! return; //! }; -//! do_work(input.as_slice(), output); +//! do_work(input, output); //! } //! ``` diff --git a/src/librustc_bitflags/lib.rs b/src/librustc_bitflags/lib.rs index c15ddf3ae77..0367130c132 100644 --- a/src/librustc_bitflags/lib.rs +++ b/src/librustc_bitflags/lib.rs @@ -86,7 +86,7 @@ /// let mut flags = FLAG_A | FLAG_B; /// flags.clear(); /// assert!(flags.is_empty()); -/// assert_eq!(format!("{:?}", flags).as_slice(), "hi!"); +/// assert_eq!(format!("{:?}", flags), "hi!"); /// } /// ``` /// diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 0d445739b39..6fc56522c6a 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -188,7 +188,7 @@ //! let json_str: String = json_obj.to_string(); //! //! // Deserialize like before -//! let decoded: TestStruct = json::decode(json_str.as_slice()).unwrap(); +//! let decoded: TestStruct = json::decode(json_str)).unwrap(); //! } //! ```