about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-05 18:47:45 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-05 18:47:45 -0800
commitafbce050ca3748a66b9e9783dc50f6c77f9bdf8b (patch)
tree300e5e6c014bf748c65be267bd4bb99edf416000 /src/libstd/path
parentcf8a11e98bf3871cf3475913fd68187784b542a3 (diff)
parentcd4205a970b07a9f4e8a2a6363ebe535df530386 (diff)
downloadrust-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/path')
-rw-r--r--src/libstd/path/mod.rs2
1 files changed, 1 insertions, 1 deletions
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