rollup merge of #21157: steveklabnik/deprecation

Author: alexcrichton

src/libcore/str/mod.rs

@@ -1147,7 +1147,7 @@ mod traits {
 
 /// Any string that can be represented as a slice
 #[unstable = "Instead of taking this bound generically, this trait will be \
-              replaced with one of slicing syntax, deref coercions, or \
+              replaced with one of slicing syntax (&foo[]), deref coercions, or \
               a more generic conversion trait"]
 pub trait Str {
     /// Work with `self` as a slice.