diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-08-06 20:03:55 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-08-13 11:30:14 -0700 |
| commit | fbc93082ec92c3534c4b27fef35d78d97bd77fd2 (patch) | |
| tree | d5154fe0a4a461ce65f1dff659ac9117fb310e8d /src/libcore/option.rs | |
| parent | 4f5b6927e8e428239082ecc17b85a0506bcc9a65 (diff) | |
| download | rust-fbc93082ec92c3534c4b27fef35d78d97bd77fd2.tar.gz rust-fbc93082ec92c3534c4b27fef35d78d97bd77fd2.zip | |
std: Rename slice::Vector to Slice
This required some contortions because importing both raw::Slice and slice::Slice makes rustc crash. Since `Slice` is in the prelude, this renaming is unlikely to casue breakage. [breaking-change]
Diffstat (limited to 'src/libcore/option.rs')
| -rw-r--r-- | src/libcore/option.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index f8293aeb03d..74d87712a02 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -143,7 +143,7 @@ use cmp::{PartialEq, Eq, Ord}; use default::Default; -use slice::Vector; +use slice::Slice; use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSize}; use mem; use slice; @@ -518,7 +518,7 @@ impl<T: Default> Option<T> { // Trait implementations ///////////////////////////////////////////////////////////////////////////// -impl<T> Vector<T> for Option<T> { +impl<T> Slice<T> for Option<T> { /// Convert from `Option<T>` to `&[T]` (without copying) #[inline] fn as_slice<'a>(&'a self) -> &'a [T] { |