about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-13 23:56:11 +0000
committerbors <bors@rust-lang.org>2017-01-13 23:56:11 +0000
commit7789881747f2ae40a520ae169eb90eb5d93795cc (patch)
tree23a0869fa4113ddad3d0003b3e68d8a7bda30503 /src/libstd/io
parent8780962828858c5b858b847430514505497a2b5c (diff)
parenta861eb0aac22dc149fdace5d6e095160ae3efe01 (diff)
Auto merge of #39030 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 10 pull requests

- Successful merges: #38362, #38636, #38877, #38946, #38965, #38986, #38994, #38995, #39024, #39027
- Failed merges:
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/error.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs
index 795c89c0007..434f522cc1e 100644
--- a/src/libstd/io/error.rs
+++ b/src/libstd/io/error.rs
@@ -388,12 +388,12 @@ impl Error {
     /// impl MyError {
     ///     fn new() -> MyError {
     ///         MyError {
-    ///             v: "oh no!".to_owned()
+    ///             v: "oh no!".to_string()
     ///         }
     ///     }
     ///
     ///     fn change_message(&mut self, new_message: &str) {
-    ///         self.v = new_message.to_owned();
+    ///         self.v = new_message.to_string();
     ///     }
     /// }
     ///