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/libcore/str | |
| 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/libcore/str')
| -rw-r--r-- | src/libcore/str/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 2fe8f35a9ab..0dec61ea75e 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -1145,7 +1145,7 @@ mod traits { #[unstable = "Instead of taking this bound generically, this trait will be \ replaced with one of slicing syntax, deref coercions, or \ a more generic conversion trait"] -pub trait Str for Sized? { +pub trait Str { /// Work with `self` as a slice. fn as_slice<'a>(&'a self) -> &'a str; } @@ -1186,7 +1186,7 @@ delegate_iter!{pattern forward &'a str in RSplitN<'a, P>} /// Methods for string slices #[allow(missing_docs)] -pub trait StrExt for Sized? { +pub trait StrExt { // NB there are no docs here are they're all located on the StrExt trait in // libcollections, not here. |