diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 18:47:45 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 18:47:45 -0800 |
| commit | afbce050ca3748a66b9e9783dc50f6c77f9bdf8b (patch) | |
| tree | 300e5e6c014bf748c65be267bd4bb99edf416000 /src/libcollections | |
| parent | cf8a11e98bf3871cf3475913fd68187784b542a3 (diff) | |
| parent | cd4205a970b07a9f4e8a2a6363ebe535df530386 (diff) | |
| download | rust-afbce050ca3748a66b9e9783dc50f6c77f9bdf8b.tar.gz rust-afbce050ca3748a66b9e9783dc50f6c77f9bdf8b.zip | |
rollup merge of #20556: japaric/no-for-sized
Conflicts: src/libcollections/slice.rs src/libcollections/str.rs src/libcore/borrow.rs src/libcore/cmp.rs src/libcore/ops.rs src/libstd/c_str.rs src/test/compile-fail/issue-19009.rs
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/slice.rs | 3 | ||||
| -rw-r--r-- | src/libcollections/str.rs | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 1afdd8c023b..d41ca2e2149 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -122,6 +122,7 @@ pub type MutItems<'a, T:'a> = IterMut<'a, T>; //////////////////////////////////////////////////////////////////////////////// /// Allocating extension methods for slices. +#[stable] pub trait SliceExt for Sized? { #[stable] type Item; @@ -1007,7 +1008,7 @@ impl<T: Ord> OrdSliceExt<T> for [T] { #[unstable = "U should be an associated type"] /// An extension trait for concatenating slices -pub trait SliceConcatExt<Sized? T, U> for Sized? { +pub trait SliceConcatExt<Sized? T, U> { /// Flattens a slice of `T` into a single value `U`. #[stable] fn concat(&self) -> U; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index 4a5dcb51322..f994348ffe7 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -60,7 +60,6 @@ use core::char::CharExt; use core::clone::Clone; use core::iter::AdditiveIterator; use core::iter::{range, Iterator, IteratorExt}; -use core::kinds::Sized; use core::ops; use core::option::Option::{self, Some, None}; use core::slice::AsSlice; @@ -409,7 +408,7 @@ Section: Trait implementations /// Any string that can be represented as a slice. #[stable] -pub trait StrExt for Sized?: ops::Slice<uint, str> { +pub trait StrExt: ops::Slice<uint, str> { /// Escapes each char in `s` with `char::escape_default`. #[unstable = "return type may change to be an iterator"] fn escape_default(&self) -> String { |