Skip to content

collections: Convert SliceConcatExt to use associated types #25120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/libcollections/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -996,9 +996,13 @@ impl<T> [T] {
////////////////////////////////////////////////////////////////////////////////
// Extension traits for slices over specific kinds of data
////////////////////////////////////////////////////////////////////////////////
#[unstable(feature = "collections", reason = "U should be an associated type")]
#[unstable(feature = "collections", reason = "recently changed")]
/// An extension trait for concatenating slices
pub trait SliceConcatExt<T: ?Sized, U> {
pub trait SliceConcatExt<T: ?Sized> {
#[unstable(feature = "collections", reason = "recently changed")]
/// The resulting type after concatenation
type Output;

/// Flattens a slice of `T` into a single value `U`.
///
/// # Examples
Expand All @@ -1011,7 +1015,7 @@ pub trait SliceConcatExt<T: ?Sized, U> {
/// println!("{}", s); // prints "helloworld"
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
fn concat(&self) -> U;
fn concat(&self) -> Self::Output;

/// Flattens a slice of `T` into a single value `U`, placing a given separator between each.
///
Expand All @@ -1025,10 +1029,12 @@ pub trait SliceConcatExt<T: ?Sized, U> {
/// println!("{}", s); // prints "hello world"
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
fn connect(&self, sep: &T) -> U;
fn connect(&self, sep: &T) -> Self::Output;
}

impl<T: Clone, V: AsRef<[T]>> SliceConcatExt<T, Vec<T>> for [V] {
impl<T: Clone, V: AsRef<[T]>> SliceConcatExt<T> for [V] {
type Output = Vec<T>;

fn concat(&self) -> Vec<T> {
let size = self.iter().fold(0, |acc, v| acc + v.as_ref().len());
let mut result = Vec::with_capacity(size);
Expand Down
4 changes: 3 additions & 1 deletion src/libcollections/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ pub use core::str::pattern;
Section: Creating a string
*/

impl<S: AsRef<str>> SliceConcatExt<str, String> for [S] {
impl<S: AsRef<str>> SliceConcatExt<str> for [S] {
type Output = String;

fn concat(&self) -> String {
if self.is_empty() {
return String::new();
Expand Down