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/libstd | |
| 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/libstd')
| -rw-r--r-- | src/libstd/ascii.rs | 3 | ||||
| -rw-r--r-- | src/libstd/path/mod.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index e9b7e33bcf5..671408acebf 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -14,7 +14,6 @@ #![unstable = "unsure about placement and naming"] -use core::kinds::Sized; use iter::IteratorExt; use ops::FnMut; use slice::SliceExt; @@ -38,7 +37,7 @@ pub trait OwnedAsciiExt { /// Extension methods for ASCII-subset only operations on string slices #[experimental = "would prefer to do this in a more general way"] -pub trait AsciiExt<T = Self> for Sized? { +pub trait AsciiExt<T = Self> { /// Check if within the ASCII range. fn is_ascii(&self) -> bool; diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 2f014872402..a2d69a7e7dc 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -786,7 +786,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { } /// A trait that represents something bytes-like (e.g. a &[u8] or a &str) -pub trait BytesContainer for Sized? { +pub trait BytesContainer { /// Returns a &[u8] representing the receiver fn container_as_bytes<'a>(&'a self) -> &'a [u8]; /// Returns the receiver interpreted as a utf-8 string, if possible |