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
This commit is contained in:
commit
384e218789
64 changed files with 251 additions and 245 deletions
|
@ -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()
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue