user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #61146 - czipperz:SliceConcatExt-connect-default-to-join, r=sfackler

Browse source 
SliceConcatExt::connect defaults to calling join

It makes sense to default a deprecated method to the new one.  Precedence example is `Error::cause` defaults to calling `Error::source`.
This commit is contained in:
Mazdak Farrokhzad 2019-06-22 01:42:30 +02:00 • committed by GitHub
commit 3a8536edef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/liballoc/slice.rs
View file

@ -581,7 +581,9 @@ pub trait SliceConcatExt<T: ?Sized> {
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_deprecated(since = "1.3.0", reason = "renamed to join")]
fn connect(&self, sep: &T) -> Self::Output;
fn connect(&self, sep: &T) -> Self::Output {
self.join(sep)
}
}
#[unstable(feature = "slice_concat_ext",
@ -615,10 +617,6 @@ impl<T: Clone, V: Borrow<[T]>> SliceConcatExt<T> for [V] {
}
result
}
fn connect(&self, sep: &T) -> Vec<T> {
self.join(sep)
}
}
////////////////////////////////////////////////////////////////////////////////

4
src/liballoc/str.rs
View file

@ -86,10 +86,6 @@ impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
String::from_utf8_unchecked( join_generic_copy(self, sep.as_bytes()) )
}
}
fn connect(&self, sep: &str) -> String {
self.join(sep)
}
}
macro_rules! spezialize_for_lengths {