diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 2039dcc7d14c..85e1a7decc2b 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -671,7 +671,7 @@ pub fn usage(brief: &str, opts: &[OptGroup]) -> String { hasarg: hasarg, ..} = (*optref).clone(); - let mut row = String::from_owned_str(" ".repeat(4)); + let mut row = " ".repeat(4); // short option match short_name.len() { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index d68ed099a4a4..b57c329983ea 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -910,10 +910,9 @@ impl OwnedStr for String { } #[inline] - fn append(self, rhs: &str) -> String { - let mut new_str = String::from_owned_str(self); - new_str.push_str(rhs); - new_str + fn append(mut self, rhs: &str) -> String { + self.push_str(rhs); + self } } diff --git a/src/libstd/string.rs b/src/libstd/string.rs index f4d1e2a18588..8897750df654 100644 --- a/src/libstd/string.rs +++ b/src/libstd/string.rs @@ -68,7 +68,8 @@ impl String { } } - /// Creates a new string buffer from the given owned string, taking care not to copy it. + #[allow(missing_doc)] + #[deprecated = "obsoleted by the removal of ~str"] #[inline] pub fn from_owned_str(string: String) -> String { string diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 89f8d2277173..f10f16cc0701 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -110,7 +110,7 @@ impl TestDesc { use std::num::Saturating; let mut name = String::from_str(self.name.as_slice()); let fill = column_count.saturating_sub(name.len()); - let mut pad = String::from_owned_str(" ".repeat(fill)); + let mut pad = " ".repeat(fill); match align { PadNone => name, PadOnLeft => {