Skip to content

Commit 004db80

Browse files
committed
libcore: DST-ify AsSlice
This commit changes `AsSlice` to work on unsized types, and changes the `impl` for `&[T]` to `[T]`. Aside from making the trait more general, this also helps some ongoing work with method resolution changes. This is a breaking change: code that uses generics bounded by `AsSlice` will have to change. In particular, such code previously often took arguments of type `V` where `V: AsSlice<T>` by value. These should now be taken by reference: ```rust fn foo<Sized? V: AsSlice<T>>(v: &V) { .. } ``` A few std lib functions have been changed accordingly. [breaking-change]
1 parent 7936242 commit 004db80

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

src/libcollections/slice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub trait VectorVector<T> for Sized? {
121121
fn connect_vec(&self, sep: &T) -> Vec<T>;
122122
}
123123

124-
impl<T: Clone, V: AsSlice<T>> VectorVector<T> for [V] {
124+
impl<'a, T: Clone, V: AsSlice<T>> VectorVector<T> for [V] {
125125
fn concat_vec(&self) -> Vec<T> {
126126
let size = self.iter().fold(0u, |acc, v| acc + v.as_slice().len());
127127
let mut result = Vec::with_capacity(size);

src/libcollections/vec.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use core::cmp::max;
2020
use core::default::Default;
2121
use core::fmt;
2222
use core::kinds::marker::{ContravariantLifetime, InvariantType};
23+
use core::kinds::Sized;
2324
use core::mem;
2425
use core::num::{Int, UnsignedInt};
2526
use core::ops;
@@ -516,7 +517,7 @@ impl<T: PartialOrd> PartialOrd for Vec<T> {
516517
impl<T: Eq> Eq for Vec<T> {}
517518

518519
#[experimental]
519-
impl<T: PartialEq, V: AsSlice<T>> Equiv<V> for Vec<T> {
520+
impl<T: PartialEq, Sized? V: AsSlice<T>> Equiv<V> for Vec<T> {
520521
#[inline]
521522
fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() }
522523
}
@@ -1181,7 +1182,7 @@ impl<T> AsSlice<T> for Vec<T> {
11811182
}
11821183
}
11831184

1184-
impl<T: Clone, V: AsSlice<T>> Add<V, Vec<T>> for Vec<T> {
1185+
impl<T: Clone, Sized? V: AsSlice<T>> Add<V, Vec<T>> for Vec<T> {
11851186
#[inline]
11861187
fn add(&self, rhs: &V) -> Vec<T> {
11871188
let mut res = Vec::with_capacity(self.len() + rhs.as_slice().len());

src/libcore/slice.rs

+15-5
Original file line numberDiff line numberDiff line change
@@ -1008,15 +1008,25 @@ impl<T: Clone> CloneSlicePrelude<T> for [T] {
10081008

10091009
/// Data that is viewable as a slice.
10101010
#[unstable = "may merge with other traits"]
1011-
pub trait AsSlice<T> {
1011+
pub trait AsSlice<T> for Sized? {
10121012
/// Work with `self` as a slice.
10131013
fn as_slice<'a>(&'a self) -> &'a [T];
10141014
}
10151015

10161016
#[unstable = "trait is unstable"]
1017-
impl<'a,T> AsSlice<T> for &'a [T] {
1017+
impl<T> AsSlice<T> for [T] {
10181018
#[inline(always)]
1019-
fn as_slice<'a>(&'a self) -> &'a [T] { *self }
1019+
fn as_slice<'a>(&'a self) -> &'a [T] { self }
1020+
}
1021+
1022+
impl<'a, T, Sized? U: AsSlice<T>> AsSlice<T> for &'a U {
1023+
#[inline(always)]
1024+
fn as_slice<'a>(&'a self) -> &'a [T] { AsSlice::as_slice(*self) }
1025+
}
1026+
1027+
impl<'a, T, Sized? U: AsSlice<T>> AsSlice<T> for &'a mut U {
1028+
#[inline(always)]
1029+
fn as_slice<'a>(&'a self) -> &'a [T] { AsSlice::as_slice(*self) }
10201030
}
10211031

10221032
#[unstable = "waiting for DST"]
@@ -1681,13 +1691,13 @@ impl<T: PartialEq> PartialEq for [T] {
16811691
impl<T: Eq> Eq for [T] {}
16821692

16831693
#[unstable = "waiting for DST"]
1684-
impl<T: PartialEq, V: AsSlice<T>> Equiv<V> for [T] {
1694+
impl<T: PartialEq, Sized? V: AsSlice<T>> Equiv<V> for [T] {
16851695
#[inline]
16861696
fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() }
16871697
}
16881698

16891699
#[unstable = "waiting for DST"]
1690-
impl<'a,T:PartialEq, V: AsSlice<T>> Equiv<V> for &'a mut [T] {
1700+
impl<'a,T:PartialEq, Sized? V: AsSlice<T>> Equiv<V> for &'a mut [T] {
16911701
#[inline]
16921702
fn equiv(&self, other: &V) -> bool { self.as_slice() == other.as_slice() }
16931703
}

src/libgraphviz/maybe_owned_vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl<'a, T: Ord> Ord for MaybeOwnedVector<'a, T> {
8989
}
9090
}
9191

92-
impl<'a, T: PartialEq, V: AsSlice<T>> Equiv<V> for MaybeOwnedVector<'a, T> {
92+
impl<'a, T: PartialEq, Sized? V: AsSlice<T>> Equiv<V> for MaybeOwnedVector<'a, T> {
9393
fn equiv(&self, other: &V) -> bool {
9494
self.as_slice() == other.as_slice()
9595
}

src/libstd/path/posix.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
1616
use hash;
1717
use io::Writer;
1818
use iter::{DoubleEndedIterator, AdditiveIterator, Extend, Iterator, Map};
19+
use kinds::Sized;
1920
use option::{Option, None, Some};
2021
use str::{FromStr, Str};
2122
use str;
@@ -342,7 +343,7 @@ impl Path {
342343

343344
/// Returns a normalized byte vector representation of a path, by removing all empty
344345
/// components, and unnecessary . and .. components.
345-
fn normalize<V: AsSlice<u8>>(v: V) -> Vec<u8> {
346+
fn normalize<Sized? V: AsSlice<u8>>(v: &V) -> Vec<u8> {
346347
// borrowck is being very picky
347348
let val = {
348349
let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == SEP_BYTE;

0 commit comments

Comments
 (0)