diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 5e341ba8b04d3..e077f7f6021bd 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -121,7 +121,7 @@ pub trait VectorVector for Sized? { fn connect_vec(&self, sep: &T) -> Vec; } -impl> VectorVector for [V] { +impl<'a, T: Clone, V: AsSlice> VectorVector for [V] { fn concat_vec(&self) -> Vec { let size = self.iter().fold(0u, |acc, v| acc + v.as_slice().len()); let mut result = Vec::with_capacity(size); diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 7111a0776307a..d6a21ef19a28b 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -20,6 +20,7 @@ use core::cmp::max; use core::default::Default; use core::fmt; use core::kinds::marker::{ContravariantLifetime, InvariantType}; +use core::kinds::Sized; use core::mem; use core::num::{Int, UnsignedInt}; use core::ops; @@ -516,7 +517,7 @@ impl PartialOrd for Vec { impl Eq for Vec {} #[experimental] -impl> Equiv for Vec { +impl> Equiv for Vec { #[inline] fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() } } @@ -1181,7 +1182,7 @@ impl AsSlice for Vec { } } -impl> Add> for Vec { +impl> Add> for Vec { #[inline] fn add(&self, rhs: &V) -> Vec { let mut res = Vec::with_capacity(self.len() + rhs.as_slice().len()); diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 59d31a0749f11..51122d0a17023 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -241,7 +241,7 @@ pub trait PartialOrd for Sized?: PartialEq { /// container types; e.g. it is often desirable to be able to use `&str` /// values to look up entries in a container with `String` keys. #[experimental = "Better solutions may be discovered."] -pub trait Equiv for Sized? { +pub trait Equiv for Sized? { /// Implement this function to decide equivalent values. fn equiv(&self, other: &T) -> bool; } diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index b4bf5351e597b..185c937eb6b37 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -112,7 +112,7 @@ pub trait Drop { * ``` */ #[lang="add"] -pub trait Add { +pub trait Add for Sized? { /// The method for the `+` operator fn add(&self, rhs: &RHS) -> Result; } @@ -153,7 +153,7 @@ add_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64) * ``` */ #[lang="sub"] -pub trait Sub { +pub trait Sub for Sized? { /// The method for the `-` operator fn sub(&self, rhs: &RHS) -> Result; } @@ -194,7 +194,7 @@ sub_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64) * ``` */ #[lang="mul"] -pub trait Mul { +pub trait Mul for Sized? { /// The method for the `*` operator fn mul(&self, rhs: &RHS) -> Result; } @@ -235,7 +235,7 @@ mul_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64) * ``` */ #[lang="div"] -pub trait Div { +pub trait Div for Sized? { /// The method for the `/` operator fn div(&self, rhs: &RHS) -> Result; } @@ -276,7 +276,7 @@ div_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64 f32 f64) * ``` */ #[lang="rem"] -pub trait Rem { +pub trait Rem for Sized? { /// The method for the `%` operator fn rem(&self, rhs: &RHS) -> Result; } @@ -331,7 +331,7 @@ rem_float_impl!(f64, fmod) * ``` */ #[lang="neg"] -pub trait Neg { +pub trait Neg for Sized? { /// The method for the unary `-` operator fn neg(&self) -> Result; } @@ -388,7 +388,7 @@ neg_uint_impl!(u64, i64) * ``` */ #[lang="not"] -pub trait Not { +pub trait Not for Sized? { /// The method for the unary `!` operator fn not(&self) -> Result; } @@ -430,7 +430,7 @@ not_impl!(bool uint u8 u16 u32 u64 int i8 i16 i32 i64) * ``` */ #[lang="bitand"] -pub trait BitAnd { +pub trait BitAnd for Sized? { /// The method for the `&` operator fn bitand(&self, rhs: &RHS) -> Result; } @@ -471,7 +471,7 @@ bitand_impl!(bool uint u8 u16 u32 u64 int i8 i16 i32 i64) * ``` */ #[lang="bitor"] -pub trait BitOr { +pub trait BitOr for Sized? { /// The method for the `|` operator fn bitor(&self, rhs: &RHS) -> Result; } @@ -512,7 +512,7 @@ bitor_impl!(bool uint u8 u16 u32 u64 int i8 i16 i32 i64) * ``` */ #[lang="bitxor"] -pub trait BitXor { +pub trait BitXor for Sized? { /// The method for the `^` operator fn bitxor(&self, rhs: &RHS) -> Result; } @@ -553,7 +553,7 @@ bitxor_impl!(bool uint u8 u16 u32 u64 int i8 i16 i32 i64) * ``` */ #[lang="shl"] -pub trait Shl { +pub trait Shl for Sized? { /// The method for the `<<` operator fn shl(&self, rhs: &RHS) -> Result; } @@ -596,7 +596,7 @@ shl_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64) * ``` */ #[lang="shr"] -pub trait Shr { +pub trait Shr for Sized? { /// The method for the `>>` operator fn shr(&self, rhs: &RHS) -> Result; } @@ -669,7 +669,7 @@ pub trait Index for Sized? { * ``` */ #[lang="index_mut"] -pub trait IndexMut for Sized? { +pub trait IndexMut for Sized? { /// The method for the indexing (`Foo[Bar]`) operation fn index_mut<'a>(&'a mut self, index: &Index) -> &'a mut Result; } @@ -712,7 +712,7 @@ pub trait IndexMut for Sized? { * ``` */ #[lang="slice"] -pub trait Slice for Sized? { +pub trait Slice for Sized? { /// The method for the slicing operation foo[] fn as_slice_<'a>(&'a self) -> &'a Result; /// The method for the slicing operation foo[from..] @@ -761,7 +761,7 @@ pub trait Slice for Sized? { * ``` */ #[lang="slice_mut"] -pub trait SliceMut for Sized? { +pub trait SliceMut for Sized? { /// The method for the slicing operation foo[] fn as_mut_slice_<'a>(&'a mut self) -> &'a mut Result; /// The method for the slicing operation foo[from..] @@ -800,7 +800,7 @@ pub trait SliceMut for Sized? { * ``` */ #[lang="deref"] -pub trait Deref { +pub trait Deref for Sized? { /// The method called to dereference a value fn deref<'a>(&'a self) -> &'a Result; } @@ -859,21 +859,21 @@ impl<'a, Sized? T> DerefMut for &'a mut T { /// A version of the call operator that takes an immutable receiver. #[lang="fn"] -pub trait Fn { +pub trait Fn for Sized? { /// This is called when the call operator is used. extern "rust-call" fn call(&self, args: Args) -> Result; } /// A version of the call operator that takes a mutable receiver. #[lang="fn_mut"] -pub trait FnMut { +pub trait FnMut for Sized? { /// This is called when the call operator is used. extern "rust-call" fn call_mut(&mut self, args: Args) -> Result; } /// A version of the call operator that takes a by-value receiver. #[lang="fn_once"] -pub trait FnOnce { +pub trait FnOnce for Sized? { /// This is called when the call operator is used. extern "rust-call" fn call_once(self, args: Args) -> Result; } diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index 48e52fab51c5e..7a3e06e7eb40d 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -1008,15 +1008,25 @@ impl CloneSlicePrelude for [T] { /// Data that is viewable as a slice. #[unstable = "may merge with other traits"] -pub trait AsSlice { +pub trait AsSlice for Sized? { /// Work with `self` as a slice. fn as_slice<'a>(&'a self) -> &'a [T]; } #[unstable = "trait is unstable"] -impl<'a,T> AsSlice for &'a [T] { +impl AsSlice for [T] { #[inline(always)] - fn as_slice<'a>(&'a self) -> &'a [T] { *self } + fn as_slice<'a>(&'a self) -> &'a [T] { self } +} + +impl<'a, T, Sized? U: AsSlice> AsSlice for &'a U { + #[inline(always)] + fn as_slice<'a>(&'a self) -> &'a [T] { AsSlice::as_slice(*self) } +} + +impl<'a, T, Sized? U: AsSlice> AsSlice for &'a mut U { + #[inline(always)] + fn as_slice<'a>(&'a self) -> &'a [T] { AsSlice::as_slice(*self) } } #[unstable = "waiting for DST"] @@ -1681,13 +1691,13 @@ impl PartialEq for [T] { impl Eq for [T] {} #[unstable = "waiting for DST"] -impl> Equiv for [T] { +impl> Equiv for [T] { #[inline] fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() } } #[unstable = "waiting for DST"] -impl<'a,T:PartialEq, V: AsSlice> Equiv for &'a mut [T] { +impl<'a,T:PartialEq, Sized? V: AsSlice> Equiv for &'a mut [T] { #[inline] fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() } } diff --git a/src/libgraphviz/maybe_owned_vec.rs b/src/libgraphviz/maybe_owned_vec.rs index 5d97e9787e805..70b3971c6b805 100644 --- a/src/libgraphviz/maybe_owned_vec.rs +++ b/src/libgraphviz/maybe_owned_vec.rs @@ -89,7 +89,7 @@ impl<'a, T: Ord> Ord for MaybeOwnedVector<'a, T> { } } -impl<'a, T: PartialEq, V: AsSlice> Equiv for MaybeOwnedVector<'a, T> { +impl<'a, T: PartialEq, Sized? V: AsSlice> Equiv for MaybeOwnedVector<'a, T> { fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() } diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 3e013ba20c462..2b444fdc32bab 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -16,6 +16,7 @@ use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; use hash; use io::Writer; use iter::{DoubleEndedIterator, AdditiveIterator, Extend, Iterator, Map}; +use kinds::Sized; use option::{Option, None, Some}; use str::{FromStr, Str}; use str; @@ -342,7 +343,7 @@ impl Path { /// Returns a normalized byte vector representation of a path, by removing all empty /// components, and unnecessary . and .. components. - fn normalize>(v: V) -> Vec { + fn normalize>(v: &V) -> Vec { // borrowck is being very picky let val = { let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == SEP_BYTE;