about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-16 18:24:17 +0000
committerbors <bors@rust-lang.org>2017-11-16 18:24:17 +0000
commit58d8761ab3f2eda3536c0a8e81f2179655a6fb00 (patch)
tree560f6b6e689e6a5a91362e5d60ff3833b4c47bf0 /src/liballoc
parent481b42b50745d433c5bcfd90e7a03a4b9110a677 (diff)
parentd57fed893e63290c7ef58096cabc3aeea514014f (diff)
downloadrust-58d8761ab3f2eda3536c0a8e81f2179655a6fb00.tar.gz
rust-58d8761ab3f2eda3536c0a8e81f2179655a6fb00.zip
Auto merge of #46029 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests

- Successful merges: #45951, #45973, #45984, #45993, #46005, #46010
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/borrow.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/borrow.rs b/src/liballoc/borrow.rs
index e8aff099871..acae0daa86b 100644
--- a/src/liballoc/borrow.rs
+++ b/src/liballoc/borrow.rs
@@ -232,7 +232,7 @@ impl<'a, B: ?Sized> Cow<'a, B>
     ///
     /// assert_eq!(
     ///   cow.into_owned(),
-    ///   Cow::Owned(String::from(s))
+    ///   String::from(s)
     /// );
     /// ```
     ///
@@ -246,7 +246,7 @@ impl<'a, B: ?Sized> Cow<'a, B>
     ///
     /// assert_eq!(
     ///   cow.into_owned(),
-    ///   Cow::Owned(String::from(s))
+    ///   String::from(s)
     /// );
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]