diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 18:55:41 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 18:55:41 -0800 |
| commit | 384e21878904ad1f139d9452c122b10a28a3c28c (patch) | |
| tree | fa915ac71411765c8c5b38dc421980033005ebd6 /src/libstd/path | |
| parent | afbce050ca3748a66b9e9783dc50f6c77f9bdf8b (diff) | |
| parent | 8f3a424322f5609f75aab2313dc93b0ad73e2670 (diff) | |
| download | rust-384e21878904ad1f139d9452c122b10a28a3c28c.tar.gz rust-384e21878904ad1f139d9452c122b10a28a3c28c.zip | |
Merge remote-tracking branch 'nrc/sized-2' into rollup
Conflicts: src/liballoc/boxed.rs src/libcollections/btree/map.rs src/libcollections/slice.rs src/libcore/borrow.rs src/libcore/cmp.rs src/libcore/ops.rs src/libstd/c_str.rs src/libstd/collections/hash/map.rs src/libsyntax/parse/obsolete.rs src/test/compile-fail/unboxed-closure-sugar-default.rs src/test/compile-fail/unboxed-closure-sugar-equiv.rs src/test/compile-fail/unboxed-closure-sugar-lifetime-elision.rs src/test/compile-fail/unboxed-closure-sugar-region.rs src/test/compile-fail/unsized3.rs src/test/run-pass/associated-types-conditional-dispatch.rs
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/path/posix.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index a2d69a7e7dc..b020164158c 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -896,7 +896,7 @@ impl BytesContainer for CString { } } -impl<'a, Sized? T: BytesContainer> BytesContainer for &'a T { +impl<'a, T: ?Sized + BytesContainer> BytesContainer for &'a T { #[inline] fn container_as_bytes(&self) -> &[u8] { (**self).container_as_bytes() diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 013212b2705..1df02101ed0 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -321,7 +321,7 @@ impl Path { /// Returns a normalized byte vector representation of a path, by removing all empty /// components, and unnecessary . and .. components. - fn normalize<Sized? V: AsSlice<u8>>(v: &V) -> Vec<u8> { + fn normalize<V: ?Sized + AsSlice<u8>>(v: &V) -> Vec<u8> { // borrowck is being very picky let val = { let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == SEP_BYTE; |