2014-01-21 08:35:11 -06:00
|
|
|
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
2014-04-02 18:54:22 -05:00
|
|
|
|
2014-03-20 01:01:08 -05:00
|
|
|
//! An owned, growable vector.
|
2014-01-21 08:35:11 -06:00
|
|
|
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
use core::prelude::*;
|
|
|
|
|
|
|
|
use alloc::heap::{allocate, reallocate, deallocate};
|
|
|
|
use RawVec = core::raw::Vec;
|
|
|
|
use core::raw::Slice;
|
|
|
|
use core::cmp::max;
|
|
|
|
use core::default::Default;
|
|
|
|
use core::fmt;
|
|
|
|
use core::mem;
|
|
|
|
use core::num::{CheckedMul, CheckedAdd};
|
|
|
|
use core::num;
|
|
|
|
use core::ptr;
|
|
|
|
use core::uint;
|
|
|
|
|
|
|
|
use slice::{MutableTotalOrdVector, OwnedVector, MutableVectorAllocating};
|
|
|
|
use slice::{Items, MutItems};
|
2014-03-16 18:04:29 -05:00
|
|
|
|
2014-03-20 01:01:08 -05:00
|
|
|
/// An owned, growable vector.
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
2014-03-20 01:01:08 -05:00
|
|
|
/// # Examples
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
2014-03-20 01:01:08 -05:00
|
|
|
/// ```rust
|
|
|
|
/// # use std::vec::Vec;
|
|
|
|
/// let mut vec = Vec::new();
|
|
|
|
/// vec.push(1);
|
|
|
|
/// vec.push(2);
|
|
|
|
///
|
|
|
|
/// assert_eq!(vec.len(), 2);
|
|
|
|
/// assert_eq!(vec.get(0), &1);
|
|
|
|
///
|
|
|
|
/// assert_eq!(vec.pop(), Some(2));
|
|
|
|
/// assert_eq!(vec.len(), 1);
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// The `vec!` macro is provided to make initialization more convenient:
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// vec.push(4);
|
2014-03-20 01:01:08 -05:00
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3, 4));
|
2014-03-16 18:04:29 -05:00
|
|
|
/// ```
|
2014-03-12 15:01:33 -05:00
|
|
|
#[unsafe_no_drop_flag]
|
2014-01-21 08:35:11 -06:00
|
|
|
pub struct Vec<T> {
|
2014-03-27 17:09:47 -05:00
|
|
|
len: uint,
|
|
|
|
cap: uint,
|
|
|
|
ptr: *mut T
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> Vec<T> {
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Constructs a new, empty `Vec`.
|
|
|
|
///
|
|
|
|
/// The vector will not allocate until elements are pushed onto it.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let mut vec: Vec<int> = Vec::new();
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn new() -> Vec<T> {
|
|
|
|
Vec { len: 0, cap: 0, ptr: 0 as *mut T }
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Constructs a new, empty `Vec` with the specified capacity.
|
|
|
|
///
|
|
|
|
/// The vector will be able to hold exactly `capacity` elements without
|
|
|
|
/// reallocating. If `capacity` is 0, the vector will not allocate.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let vec: Vec<int> = Vec::with_capacity(10);
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
pub fn with_capacity(capacity: uint) -> Vec<T> {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
if mem::size_of::<T>() == 0 {
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
Vec { len: 0, cap: uint::MAX, ptr: 0 as *mut T }
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
} else if capacity == 0 {
|
2014-01-21 08:35:11 -06:00
|
|
|
Vec::new()
|
|
|
|
} else {
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
let size = ::expect(capacity.checked_mul(&mem::size_of::<T>()),
|
|
|
|
"capacity overflow");
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let ptr = unsafe { allocate(size, mem::min_align_of::<T>()) };
|
2014-01-21 08:35:11 -06:00
|
|
|
Vec { len: 0, cap: capacity, ptr: ptr as *mut T }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Creates and initializes a `Vec`.
|
|
|
|
///
|
|
|
|
/// Creates a `Vec` of size `length` and initializes the elements to the
|
|
|
|
/// value returned by the closure `op`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let vec = Vec::from_fn(3, |idx| idx * 2);
|
|
|
|
/// assert_eq!(vec, vec!(0, 2, 4));
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
pub fn from_fn(length: uint, op: |uint| -> T) -> Vec<T> {
|
|
|
|
unsafe {
|
|
|
|
let mut xs = Vec::with_capacity(length);
|
|
|
|
while xs.len < length {
|
2014-05-17 02:56:00 -05:00
|
|
|
mem::overwrite(xs.as_mut_slice().unsafe_mut_ref(xs.len),
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
op(xs.len));
|
2014-01-21 08:35:11 -06:00
|
|
|
xs.len += 1;
|
|
|
|
}
|
|
|
|
xs
|
|
|
|
}
|
|
|
|
}
|
2014-03-06 16:33:46 -06:00
|
|
|
|
2014-03-19 09:52:37 -05:00
|
|
|
/// Create a `Vec<T>` directly from the raw constituents.
|
|
|
|
///
|
|
|
|
/// This is highly unsafe:
|
|
|
|
///
|
|
|
|
/// - if `ptr` is null, then `length` and `capacity` should be 0
|
|
|
|
/// - `ptr` must point to an allocation of size `capacity`
|
|
|
|
/// - there must be `length` valid instances of type `T` at the
|
|
|
|
/// beginning of that allocation
|
|
|
|
/// - `ptr` must be allocated by the default `Vec` allocator
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
pub unsafe fn from_raw_parts(length: uint, capacity: uint,
|
|
|
|
ptr: *mut T) -> Vec<T> {
|
2014-03-19 09:52:37 -05:00
|
|
|
Vec { len: length, cap: capacity, ptr: ptr }
|
|
|
|
}
|
|
|
|
|
2014-04-20 23:49:39 -05:00
|
|
|
/// Consumes the `Vec`, partitioning it based on a predicate.
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// Partitions the `Vec` into two `Vec`s `(A,B)`, where all elements of `A`
|
|
|
|
/// satisfy `f` and all elements of `B` do not. The order of elements is
|
|
|
|
/// preserved.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3, 4);
|
|
|
|
/// let (even, odd) = vec.partition(|&n| n % 2 == 0);
|
|
|
|
/// assert_eq!(even, vec!(2, 4));
|
|
|
|
/// assert_eq!(odd, vec!(1, 3));
|
|
|
|
/// ```
|
2014-03-06 16:33:46 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn partition(self, f: |&T| -> bool) -> (Vec<T>, Vec<T>) {
|
|
|
|
let mut lefts = Vec::new();
|
|
|
|
let mut rights = Vec::new();
|
|
|
|
|
|
|
|
for elt in self.move_iter() {
|
|
|
|
if f(&elt) {
|
|
|
|
lefts.push(elt);
|
|
|
|
} else {
|
|
|
|
rights.push(elt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
(lefts, rights)
|
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Clone> Vec<T> {
|
2014-03-30 22:53:26 -05:00
|
|
|
/// Iterates over the `second` vector, copying each element and appending it to
|
|
|
|
/// the `first`. Afterwards, the `first` is then returned for use again.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2);
|
|
|
|
/// let vec = vec.append([3, 4]);
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3, 4));
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
pub fn append(mut self, second: &[T]) -> Vec<T> {
|
|
|
|
self.push_all(second);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Constructs a `Vec` by cloning elements of a slice.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let slice = [1, 2, 3];
|
|
|
|
/// let vec = Vec::from_slice(slice);
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
pub fn from_slice(values: &[T]) -> Vec<T> {
|
2014-03-08 14:47:12 -06:00
|
|
|
values.iter().map(|x| x.clone()).collect()
|
2014-03-04 12:39:49 -06:00
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Constructs a `Vec` with copies of a value.
|
|
|
|
///
|
|
|
|
/// Creates a `Vec` with `length` copies of `value`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let vec = Vec::from_elem(3, "hi");
|
|
|
|
/// println!("{}", vec); // prints [hi, hi, hi]
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
pub fn from_elem(length: uint, value: T) -> Vec<T> {
|
|
|
|
unsafe {
|
|
|
|
let mut xs = Vec::with_capacity(length);
|
|
|
|
while xs.len < length {
|
2014-05-17 02:56:00 -05:00
|
|
|
mem::overwrite(xs.as_mut_slice().unsafe_mut_ref(xs.len),
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
value.clone());
|
2014-01-21 08:35:11 -06:00
|
|
|
xs.len += 1;
|
|
|
|
}
|
|
|
|
xs
|
|
|
|
}
|
|
|
|
}
|
2014-02-18 23:36:51 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Appends all elements in a slice to the `Vec`.
|
|
|
|
///
|
|
|
|
/// Iterates over the slice `other`, clones each element, and then appends
|
|
|
|
/// it to this `Vec`. The `other` vector is traversed in-order.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1);
|
|
|
|
/// vec.push_all([2, 3, 4]);
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3, 4));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn push_all(&mut self, other: &[T]) {
|
2014-04-01 15:16:59 -05:00
|
|
|
self.extend(other.iter().map(|e| e.clone()));
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
2014-02-28 14:54:01 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Grows the `Vec` in-place.
|
|
|
|
///
|
|
|
|
/// Adds `n` copies of `value` to the `Vec`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!("hello");
|
2014-05-01 00:32:13 -05:00
|
|
|
/// vec.grow(2, &("world"));
|
2014-03-16 18:04:29 -05:00
|
|
|
/// assert_eq!(vec, vec!("hello", "world", "world"));
|
|
|
|
/// ```
|
|
|
|
pub fn grow(&mut self, n: uint, value: &T) {
|
2014-02-28 14:54:01 -06:00
|
|
|
let new_len = self.len() + n;
|
|
|
|
self.reserve(new_len);
|
|
|
|
let mut i: uint = 0u;
|
|
|
|
|
|
|
|
while i < n {
|
2014-03-16 18:04:29 -05:00
|
|
|
self.push((*value).clone());
|
2014-02-28 14:54:01 -06:00
|
|
|
i += 1u;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Sets the value of a vector element at a given index, growing the vector
|
|
|
|
/// as needed.
|
|
|
|
///
|
|
|
|
/// Sets the element at position `index` to `value`. If `index` is past the
|
|
|
|
/// end of the vector, expands the vector by replicating `initval` to fill
|
|
|
|
/// the intervening space.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!("a", "b", "c");
|
2014-05-01 00:32:13 -05:00
|
|
|
/// vec.grow_set(1, &("fill"), "d");
|
|
|
|
/// vec.grow_set(4, &("fill"), "e");
|
2014-03-16 18:04:29 -05:00
|
|
|
/// assert_eq!(vec, vec!("a", "d", "c", "fill", "e"));
|
|
|
|
/// ```
|
|
|
|
pub fn grow_set(&mut self, index: uint, initval: &T, value: T) {
|
2014-02-28 14:54:01 -06:00
|
|
|
let l = self.len();
|
|
|
|
if index >= l {
|
|
|
|
self.grow(index - l + 1u, initval);
|
|
|
|
}
|
2014-03-16 18:04:29 -05:00
|
|
|
*self.get_mut(index) = value;
|
|
|
|
}
|
|
|
|
|
2014-04-20 23:49:39 -05:00
|
|
|
/// Partitions a vector based on a predicate.
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// Clones the elements of the vector, partitioning them into two `Vec`s
|
|
|
|
/// `(A,B)`, where all elements of `A` satisfy `f` and all elements of `B`
|
|
|
|
/// do not. The order of elements is preserved.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3, 4);
|
|
|
|
/// let (even, odd) = vec.partitioned(|&n| n % 2 == 0);
|
|
|
|
/// assert_eq!(even, vec!(2, 4));
|
|
|
|
/// assert_eq!(odd, vec!(1, 3));
|
|
|
|
/// ```
|
2014-02-28 01:49:25 -06:00
|
|
|
pub fn partitioned(&self, f: |&T| -> bool) -> (Vec<T>, Vec<T>) {
|
|
|
|
let mut lefts = Vec::new();
|
|
|
|
let mut rights = Vec::new();
|
|
|
|
|
|
|
|
for elt in self.iter() {
|
|
|
|
if f(elt) {
|
|
|
|
lefts.push(elt.clone());
|
|
|
|
} else {
|
|
|
|
rights.push(elt.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
(lefts, rights)
|
|
|
|
}
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T:Clone> Clone for Vec<T> {
|
|
|
|
fn clone(&self) -> Vec<T> {
|
2014-04-15 18:35:18 -05:00
|
|
|
let len = self.len;
|
|
|
|
let mut vector = Vec::with_capacity(len);
|
|
|
|
// Unsafe code so this can be optimised to a memcpy (or something
|
|
|
|
// similarly fast) when T is Copy. LLVM is easily confused, so any
|
|
|
|
// extra operations during the loop can prevent this optimisation
|
|
|
|
{
|
|
|
|
let this_slice = self.as_slice();
|
2014-04-15 21:29:36 -05:00
|
|
|
while vector.len < len {
|
2014-04-15 18:35:18 -05:00
|
|
|
unsafe {
|
2014-05-17 02:56:00 -05:00
|
|
|
mem::overwrite(
|
2014-04-15 21:29:36 -05:00
|
|
|
vector.as_mut_slice().unsafe_mut_ref(vector.len),
|
|
|
|
this_slice.unsafe_ref(vector.len).clone());
|
2014-04-15 18:35:18 -05:00
|
|
|
}
|
2014-04-15 21:29:36 -05:00
|
|
|
vector.len += 1;
|
2014-04-15 18:35:18 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
vector
|
2014-04-03 06:28:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn clone_from(&mut self, other: &Vec<T>) {
|
|
|
|
// drop anything in self that will not be overwritten
|
|
|
|
if self.len() > other.len() {
|
|
|
|
self.truncate(other.len())
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
2014-04-03 06:28:45 -05:00
|
|
|
|
|
|
|
// reuse the contained values' allocations/resources.
|
|
|
|
for (place, thing) in self.mut_iter().zip(other.iter()) {
|
|
|
|
place.clone_from(thing)
|
|
|
|
}
|
|
|
|
|
|
|
|
// self.len <= other.len due to the truncate above, so the
|
|
|
|
// slice here is always in-bounds.
|
|
|
|
let len = self.len();
|
|
|
|
self.extend(other.slice_from(len).iter().map(|x| x.clone()));
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> FromIterator<T> for Vec<T> {
|
2014-03-30 23:45:55 -05:00
|
|
|
fn from_iter<I:Iterator<T>>(mut iterator: I) -> Vec<T> {
|
2014-02-18 23:36:51 -06:00
|
|
|
let (lower, _) = iterator.size_hint();
|
|
|
|
let mut vector = Vec::with_capacity(lower);
|
2014-03-20 08:12:56 -05:00
|
|
|
for element in iterator {
|
2014-02-18 23:36:51 -06:00
|
|
|
vector.push(element)
|
|
|
|
}
|
|
|
|
vector
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-03 14:46:24 -06:00
|
|
|
impl<T> Extendable<T> for Vec<T> {
|
2014-03-20 08:12:56 -05:00
|
|
|
fn extend<I: Iterator<T>>(&mut self, mut iterator: I) {
|
2014-03-03 14:46:24 -06:00
|
|
|
let (lower, _) = iterator.size_hint();
|
|
|
|
self.reserve_additional(lower);
|
2014-03-20 08:12:56 -05:00
|
|
|
for element in iterator {
|
2014-03-03 14:46:24 -06:00
|
|
|
self.push(element)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-29 19:45:07 -05:00
|
|
|
impl<T: PartialEq> PartialEq for Vec<T> {
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
fn eq(&self, other: &Vec<T>) -> bool {
|
|
|
|
self.as_slice() == other.as_slice()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-29 19:45:07 -05:00
|
|
|
impl<T: PartialOrd> PartialOrd for Vec<T> {
|
2014-02-24 07:11:00 -06:00
|
|
|
#[inline]
|
|
|
|
fn lt(&self, other: &Vec<T>) -> bool {
|
|
|
|
self.as_slice() < other.as_slice()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-31 12:43:52 -05:00
|
|
|
impl<T: Eq> Eq for Vec<T> {}
|
2014-02-18 23:36:51 -06:00
|
|
|
|
2014-05-31 12:43:52 -05:00
|
|
|
impl<T: Ord> Ord for Vec<T> {
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
fn cmp(&self, other: &Vec<T>) -> Ordering {
|
|
|
|
self.as_slice().cmp(&other.as_slice())
|
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> Container for Vec<T> {
|
|
|
|
#[inline]
|
|
|
|
fn len(&self) -> uint {
|
|
|
|
self.len
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-06 16:01:16 -05:00
|
|
|
// FIXME: #13996: need a way to mark the return value as `noalias`
|
|
|
|
#[inline(never)]
|
2014-05-09 22:56:28 -05:00
|
|
|
unsafe fn alloc_or_realloc<T>(ptr: *mut T, size: uint, old_size: uint) -> *mut T {
|
2014-05-06 16:01:16 -05:00
|
|
|
if old_size == 0 {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
allocate(size, mem::min_align_of::<T>()) as *mut T
|
2014-05-06 16:01:16 -05:00
|
|
|
} else {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
reallocate(ptr as *mut u8, size,
|
|
|
|
mem::min_align_of::<T>(), old_size) as *mut T
|
2014-05-06 16:01:16 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-09 23:35:56 -05:00
|
|
|
#[inline]
|
|
|
|
unsafe fn dealloc<T>(ptr: *mut T, len: uint) {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
if mem::size_of::<T>() != 0 {
|
|
|
|
deallocate(ptr as *mut u8,
|
|
|
|
len * mem::size_of::<T>(),
|
|
|
|
mem::min_align_of::<T>())
|
2014-05-09 23:35:56 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-21 08:35:11 -06:00
|
|
|
impl<T> Vec<T> {
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns the number of elements the vector can hold without
|
|
|
|
/// reallocating.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let vec: Vec<int> = Vec::with_capacity(10);
|
|
|
|
/// assert_eq!(vec.capacity(), 10);
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn capacity(&self) -> uint {
|
|
|
|
self.cap
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Reserves capacity for at least `n` additional elements in the given
|
|
|
|
/// vector.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if the new capacity overflows `uint`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let mut vec: Vec<int> = vec!(1);
|
|
|
|
/// vec.reserve_additional(10);
|
|
|
|
/// assert!(vec.capacity() >= 11);
|
|
|
|
/// ```
|
2014-03-03 14:46:24 -06:00
|
|
|
pub fn reserve_additional(&mut self, extra: uint) {
|
|
|
|
if self.cap - self.len < extra {
|
|
|
|
match self.len.checked_add(&extra) {
|
|
|
|
None => fail!("Vec::reserve_additional: `uint` overflow"),
|
|
|
|
Some(new_cap) => self.reserve(new_cap)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Reserves capacity for at least `n` elements in the given vector.
|
|
|
|
///
|
|
|
|
/// This function will over-allocate in order to amortize the allocation
|
|
|
|
/// costs in scenarios where the caller may need to repeatedly reserve
|
|
|
|
/// additional space.
|
|
|
|
///
|
|
|
|
/// If the capacity for `self` is already equal to or greater than the
|
|
|
|
/// requested capacity, then no action is taken.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// vec.reserve(10);
|
|
|
|
/// assert!(vec.capacity() >= 10);
|
|
|
|
/// ```
|
2014-02-22 17:59:23 -06:00
|
|
|
pub fn reserve(&mut self, capacity: uint) {
|
|
|
|
if capacity >= self.len {
|
|
|
|
self.reserve_exact(num::next_power_of_two(capacity))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Reserves capacity for exactly `capacity` elements in the given vector.
|
|
|
|
///
|
|
|
|
/// If the capacity for `self` is already equal to or greater than the
|
|
|
|
/// requested capacity, then no action is taken.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 02:35:51 -05:00
|
|
|
/// # use std::vec::Vec;
|
2014-03-16 18:04:29 -05:00
|
|
|
/// let mut vec: Vec<int> = Vec::with_capacity(10);
|
|
|
|
/// vec.reserve_exact(11);
|
|
|
|
/// assert_eq!(vec.capacity(), 11);
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
pub fn reserve_exact(&mut self, capacity: uint) {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
if mem::size_of::<T>() == 0 { return }
|
|
|
|
|
2014-04-01 15:16:59 -05:00
|
|
|
if capacity > self.cap {
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
let size = ::expect(capacity.checked_mul(&mem::size_of::<T>()),
|
|
|
|
"capacity overflow");
|
2014-01-21 08:35:11 -06:00
|
|
|
unsafe {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
self.ptr = alloc_or_realloc(self.ptr, size,
|
|
|
|
self.cap * mem::size_of::<T>());
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
2014-05-06 16:01:16 -05:00
|
|
|
self.cap = capacity;
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-06 16:01:16 -05:00
|
|
|
/// Shrink the capacity of the vector as much as possible
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// vec.shrink_to_fit();
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
pub fn shrink_to_fit(&mut self) {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
if mem::size_of::<T>() == 0 { return }
|
|
|
|
|
2014-01-21 08:35:11 -06:00
|
|
|
if self.len == 0 {
|
2014-05-06 16:01:16 -05:00
|
|
|
if self.cap != 0 {
|
|
|
|
unsafe {
|
2014-05-09 23:35:56 -05:00
|
|
|
dealloc(self.ptr, self.cap)
|
2014-05-06 16:01:16 -05:00
|
|
|
}
|
|
|
|
self.cap = 0;
|
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
} else {
|
|
|
|
unsafe {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
// Overflow check is unnecessary as the vector is already at
|
|
|
|
// least this large.
|
|
|
|
self.ptr = reallocate(self.ptr as *mut u8,
|
|
|
|
self.len * mem::size_of::<T>(),
|
|
|
|
mem::min_align_of::<T>(),
|
|
|
|
self.cap * mem::size_of::<T>()) as *mut T;
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
self.cap = self.len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Remove the last element from a vector and return it, or `None` if it is
|
|
|
|
/// empty.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// assert_eq!(vec.pop(), Some(3));
|
|
|
|
/// assert_eq!(vec, vec!(1, 2));
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn pop(&mut self) -> Option<T> {
|
|
|
|
if self.len == 0 {
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
unsafe {
|
|
|
|
self.len -= 1;
|
2014-02-14 17:42:01 -06:00
|
|
|
Some(ptr::read(self.as_slice().unsafe_ref(self.len())))
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Append an element to a vector.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if the number of elements in the vector overflows a `uint`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2);
|
|
|
|
/// vec.push(3);
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3));
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn push(&mut self, value: T) {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
if mem::size_of::<T>() == 0 {
|
2014-05-09 22:56:15 -05:00
|
|
|
// zero-size types consume no memory, so we can't rely on the address space running out
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
self.len = ::expect(self.len.checked_add(&1), "length overflow");
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
unsafe { mem::forget(value); }
|
2014-05-09 22:56:15 -05:00
|
|
|
return
|
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
if self.len == self.cap {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let old_size = self.cap * mem::size_of::<T>();
|
|
|
|
let size = max(old_size, 2 * mem::size_of::<T>()) * 2;
|
2014-01-21 08:35:11 -06:00
|
|
|
if old_size > size { fail!("capacity overflow") }
|
|
|
|
unsafe {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
self.ptr = alloc_or_realloc(self.ptr, size,
|
|
|
|
self.cap * mem::size_of::<T>());
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
2014-05-06 16:01:16 -05:00
|
|
|
self.cap = max(self.cap, 2) * 2;
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
unsafe {
|
2014-02-10 15:50:42 -06:00
|
|
|
let end = (self.ptr as *T).offset(self.len as int) as *mut T;
|
2014-05-17 02:56:00 -05:00
|
|
|
mem::overwrite(&mut *end, value);
|
2014-01-21 08:35:11 -06:00
|
|
|
self.len += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-30 22:53:26 -05:00
|
|
|
/// Appends one element to the vector provided. The vector itself is then
|
|
|
|
/// returned for use again.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2);
|
|
|
|
/// let vec = vec.append_one(3);
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3));
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
pub fn append_one(mut self, x: T) -> Vec<T> {
|
|
|
|
self.push(x);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Shorten a vector, dropping excess elements.
|
|
|
|
///
|
|
|
|
/// If `len` is greater than the vector's current length, this has no
|
|
|
|
/// effect.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3, 4);
|
|
|
|
/// vec.truncate(2);
|
|
|
|
/// assert_eq!(vec, vec!(1, 2));
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
pub fn truncate(&mut self, len: uint) {
|
|
|
|
unsafe {
|
|
|
|
// drop any extra elements
|
2014-05-14 16:57:27 -05:00
|
|
|
while len < self.len {
|
|
|
|
// decrement len before the read(), so a failure on Drop doesn't
|
|
|
|
// re-drop the just-failed value.
|
|
|
|
self.len -= 1;
|
|
|
|
ptr::read(self.as_slice().unsafe_ref(self.len));
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Work with `self` as a mutable slice.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// fn foo(slice: &mut [int]) {}
|
|
|
|
///
|
|
|
|
/// let mut vec = vec!(1, 2);
|
|
|
|
/// foo(vec.as_mut_slice());
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn as_mut_slice<'a>(&'a mut self) -> &'a mut [T] {
|
2014-04-17 17:28:14 -05:00
|
|
|
unsafe {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
mem::transmute(Slice { data: self.as_mut_ptr() as *T, len: self.len })
|
2014-04-17 17:28:14 -05:00
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Creates a consuming iterator, that is, one that moves each
|
|
|
|
/// value out of the vector (from start to end). The vector cannot
|
|
|
|
/// be used after calling this.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-05-25 05:10:11 -05:00
|
|
|
/// let v = vec!("a".to_string(), "b".to_string());
|
2014-03-16 18:04:29 -05:00
|
|
|
/// for s in v.move_iter() {
|
2014-05-22 18:57:53 -05:00
|
|
|
/// // s has type String, not &String
|
2014-03-16 18:04:29 -05:00
|
|
|
/// println!("{}", s);
|
|
|
|
/// }
|
|
|
|
/// ```
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn move_iter(self) -> MoveItems<T> {
|
|
|
|
unsafe {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
let iter = mem::transmute(self.as_slice().iter());
|
2014-05-09 23:35:56 -05:00
|
|
|
let ptr = self.ptr;
|
2014-05-06 16:01:16 -05:00
|
|
|
let cap = self.cap;
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
mem::forget(self);
|
2014-05-06 16:01:16 -05:00
|
|
|
MoveItems { allocation: ptr, cap: cap, iter: iter }
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-04 12:39:49 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Sets the length of a vector.
|
|
|
|
///
|
|
|
|
/// This will explicitly set the size of the vector, without actually
|
|
|
|
/// modifying its buffers, so it is up to the caller to ensure that the
|
|
|
|
/// vector is actually the specified size.
|
2014-01-21 08:35:11 -06:00
|
|
|
#[inline]
|
|
|
|
pub unsafe fn set_len(&mut self, len: uint) {
|
|
|
|
self.len = len;
|
|
|
|
}
|
2014-02-18 23:36:51 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a reference to the value at index `index`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if `index` is out of bounds
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.get(1) == &2);
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn get<'a>(&'a self, index: uint) -> &'a T {
|
|
|
|
&self.as_slice()[index]
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a mutable reference to the value at index `index`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if `index` is out of bounds
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// *vec.get_mut(1) = 4;
|
|
|
|
/// assert_eq!(vec, vec!(1, 4, 3));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn get_mut<'a>(&'a mut self, index: uint) -> &'a mut T {
|
|
|
|
&mut self.as_mut_slice()[index]
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns an iterator over references to the elements of the vector in
|
|
|
|
/// order.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// for num in vec.iter() {
|
|
|
|
/// println!("{}", *num);
|
|
|
|
/// }
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn iter<'a>(&'a self) -> Items<'a,T> {
|
|
|
|
self.as_slice().iter()
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
|
|
|
|
/// Returns an iterator over mutable references to the elements of the
|
|
|
|
/// vector in order.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// for num in vec.mut_iter() {
|
|
|
|
/// *num = 0;
|
|
|
|
/// }
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn mut_iter<'a>(&'a mut self) -> MutItems<'a,T> {
|
|
|
|
self.as_mut_slice().mut_iter()
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Sort the vector, in place, using `compare` to compare elements.
|
|
|
|
///
|
|
|
|
/// This sort is `O(n log n)` worst-case and stable, but allocates
|
|
|
|
/// approximately `2 * n`, where `n` is the length of `self`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut v = vec!(5i, 4, 1, 3, 2);
|
|
|
|
/// v.sort_by(|a, b| a.cmp(b));
|
|
|
|
/// assert_eq!(v, vec!(1, 2, 3, 4, 5));
|
|
|
|
///
|
|
|
|
/// // reverse sorting
|
|
|
|
/// v.sort_by(|a, b| b.cmp(a));
|
|
|
|
/// assert_eq!(v, vec!(5, 4, 3, 2, 1));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn sort_by(&mut self, compare: |&T, &T| -> Ordering) {
|
|
|
|
self.as_mut_slice().sort_by(compare)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a slice of `self` between `start` and `end`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when `start` or `end` point outside the bounds of `self`, or when
|
|
|
|
/// `start` > `end`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3, 4);
|
|
|
|
/// assert!(vec.slice(0, 2) == [1, 2]);
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn slice<'a>(&'a self, start: uint, end: uint) -> &'a [T] {
|
|
|
|
self.as_slice().slice(start, end)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a slice containing all but the first element of the vector.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when the vector is empty.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.tail() == [2, 3]);
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn tail<'a>(&'a self) -> &'a [T] {
|
|
|
|
self.as_slice().tail()
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns all but the first `n' elements of a vector.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when there are fewer than `n` elements in the vector.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3, 4);
|
|
|
|
/// assert!(vec.tailn(2) == [3, 4]);
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn tailn<'a>(&'a self, n: uint) -> &'a [T] {
|
|
|
|
self.as_slice().tailn(n)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a reference to the last element of a vector, or `None` if it is
|
|
|
|
/// empty.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.last() == Some(&3));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn last<'a>(&'a self) -> Option<&'a T> {
|
|
|
|
self.as_slice().last()
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a mutable reference to the last element of a vector, or `None`
|
|
|
|
/// if it is empty.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// *vec.mut_last().unwrap() = 4;
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 4));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn mut_last<'a>(&'a mut self) -> Option<&'a mut T> {
|
|
|
|
self.as_mut_slice().mut_last()
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Remove an element from anywhere in the vector and return it, replacing
|
|
|
|
/// it with the last element. This does not preserve ordering, but is O(1).
|
|
|
|
///
|
|
|
|
/// Returns `None` if `index` is out of bounds.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
/// ```rust
|
2014-05-25 05:10:11 -05:00
|
|
|
/// let mut v = vec!("foo".to_string(), "bar".to_string(),
|
|
|
|
/// "baz".to_string(), "qux".to_string());
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
2014-05-25 05:10:11 -05:00
|
|
|
/// assert_eq!(v.swap_remove(1), Some("bar".to_string()));
|
|
|
|
/// assert_eq!(v, vec!("foo".to_string(), "qux".to_string(), "baz".to_string()));
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
2014-05-25 05:10:11 -05:00
|
|
|
/// assert_eq!(v.swap_remove(0), Some("foo".to_string()));
|
|
|
|
/// assert_eq!(v, vec!("baz".to_string(), "qux".to_string()));
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// assert_eq!(v.swap_remove(2), None);
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
2014-02-22 17:56:38 -06:00
|
|
|
pub fn swap_remove(&mut self, index: uint) -> Option<T> {
|
2014-02-18 23:36:51 -06:00
|
|
|
let length = self.len();
|
|
|
|
if index < length - 1 {
|
|
|
|
self.as_mut_slice().swap(index, length - 1);
|
2014-02-22 17:56:38 -06:00
|
|
|
} else if index >= length {
|
|
|
|
return None
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
2014-02-22 17:56:38 -06:00
|
|
|
self.pop()
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Prepend an element to the vector.
|
|
|
|
///
|
|
|
|
/// # Warning
|
|
|
|
///
|
|
|
|
/// This is an O(n) operation as it requires copying every element in the
|
|
|
|
/// vector.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// vec.unshift(4);
|
|
|
|
/// assert_eq!(vec, vec!(4, 1, 2, 3));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn unshift(&mut self, element: T) {
|
|
|
|
self.insert(0, element)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Removes the first element from a vector and returns it, or `None` if
|
|
|
|
/// the vector is empty.
|
|
|
|
///
|
|
|
|
/// # Warning
|
|
|
|
///
|
|
|
|
/// This is an O(n) operation as it requires copying every element in the
|
|
|
|
/// vector.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.shift() == Some(1));
|
|
|
|
/// assert_eq!(vec, vec!(2, 3));
|
|
|
|
/// ```
|
2014-03-10 23:53:23 -05:00
|
|
|
#[inline]
|
|
|
|
pub fn shift(&mut self) -> Option<T> {
|
|
|
|
self.remove(0)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Insert an element at position `index` within the vector, shifting all
|
|
|
|
/// elements after position i one position to the right.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if `index` is out of bounds of the vector.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3);
|
|
|
|
/// vec.insert(1, 4);
|
|
|
|
/// assert_eq!(vec, vec!(1, 4, 2, 3));
|
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
pub fn insert(&mut self, index: uint, element: T) {
|
|
|
|
let len = self.len();
|
|
|
|
assert!(index <= len);
|
|
|
|
// space for the new element
|
2014-02-22 17:59:23 -06:00
|
|
|
self.reserve(len + 1);
|
2014-02-18 23:36:51 -06:00
|
|
|
|
|
|
|
unsafe { // infallible
|
|
|
|
// The spot to put the new value
|
|
|
|
{
|
2014-03-16 16:20:44 -05:00
|
|
|
let p = self.as_mut_ptr().offset(index as int);
|
2014-02-18 23:36:51 -06:00
|
|
|
// Shift everything over to make space. (Duplicating the
|
|
|
|
// `index`th element into two consecutive places.)
|
|
|
|
ptr::copy_memory(p.offset(1), &*p, len - index);
|
|
|
|
// Write it in, overwriting the first copy of the `index`th
|
|
|
|
// element.
|
2014-05-17 02:56:00 -05:00
|
|
|
mem::overwrite(&mut *p, element);
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
|
|
|
self.set_len(len + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Remove and return the element at position `index` within the vector,
|
|
|
|
/// shifting all elements after position `index` one position to the left.
|
|
|
|
/// Returns `None` if `i` is out of bounds.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-03-20 01:01:08 -05:00
|
|
|
/// let mut v = vec!(1, 2, 3);
|
2014-03-16 18:04:29 -05:00
|
|
|
/// assert_eq!(v.remove(1), Some(2));
|
2014-03-20 01:01:08 -05:00
|
|
|
/// assert_eq!(v, vec!(1, 3));
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// assert_eq!(v.remove(4), None);
|
|
|
|
/// // v is unchanged:
|
2014-03-20 01:01:08 -05:00
|
|
|
/// assert_eq!(v, vec!(1, 3));
|
2014-03-16 18:04:29 -05:00
|
|
|
/// ```
|
2014-03-18 11:53:32 -05:00
|
|
|
pub fn remove(&mut self, index: uint) -> Option<T> {
|
2014-03-10 23:53:23 -05:00
|
|
|
let len = self.len();
|
|
|
|
if index < len {
|
|
|
|
unsafe { // infallible
|
|
|
|
let ret;
|
|
|
|
{
|
|
|
|
// the place we are taking from.
|
2014-03-16 16:20:44 -05:00
|
|
|
let ptr = self.as_mut_ptr().offset(index as int);
|
2014-03-10 23:53:23 -05:00
|
|
|
// copy it out, unsafely having a copy of the value on
|
|
|
|
// the stack and in the vector at the same time.
|
|
|
|
ret = Some(ptr::read(ptr as *T));
|
|
|
|
|
|
|
|
// Shift everything down to fill in that spot.
|
|
|
|
ptr::copy_memory(ptr, &*ptr.offset(1), len - index - 1);
|
|
|
|
}
|
|
|
|
self.set_len(len - 1);
|
|
|
|
ret
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Takes ownership of the vector `other`, moving all elements into
|
|
|
|
/// the current vector. This does not copy any elements, and it is
|
|
|
|
/// illegal to use the `other` vector after calling this method
|
|
|
|
/// (because it is moved here).
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
2014-05-05 20:56:44 -05:00
|
|
|
/// let mut vec = vec!(box 1);
|
|
|
|
/// vec.push_all_move(vec!(box 2, box 3, box 4));
|
|
|
|
/// assert_eq!(vec, vec!(box 1, box 2, box 3, box 4));
|
2014-03-16 18:04:29 -05:00
|
|
|
/// ```
|
2014-02-18 23:36:51 -06:00
|
|
|
pub fn push_all_move(&mut self, other: Vec<T>) {
|
2014-04-01 15:16:59 -05:00
|
|
|
self.extend(other.move_iter());
|
2014-02-18 23:36:51 -06:00
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a mutable slice of `self` between `start` and `end`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when `start` or `end` point outside the bounds of `self`, or when
|
|
|
|
/// `start` > `end`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3, 4);
|
|
|
|
/// assert!(vec.mut_slice(0, 2) == [1, 2]);
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn mut_slice<'a>(&'a mut self, start: uint, end: uint)
|
2014-03-16 18:04:29 -05:00
|
|
|
-> &'a mut [T] {
|
2014-03-04 12:39:49 -06:00
|
|
|
self.as_mut_slice().mut_slice(start, end)
|
|
|
|
}
|
|
|
|
|
2014-03-17 22:52:06 -05:00
|
|
|
/// Returns a mutable slice of self from `start` to the end of the vec.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when `start` points outside the bounds of self.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3, 4);
|
|
|
|
/// assert!(vec.mut_slice_from(2) == [3, 4]);
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
pub fn mut_slice_from<'a>(&'a mut self, start: uint) -> &'a mut [T] {
|
|
|
|
self.as_mut_slice().mut_slice_from(start)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns a mutable slice of self from the start of the vec to `end`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when `end` points outside the bounds of self.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3, 4);
|
|
|
|
/// assert!(vec.mut_slice_to(2) == [1, 2]);
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
pub fn mut_slice_to<'a>(&'a mut self, end: uint) -> &'a mut [T] {
|
|
|
|
self.as_mut_slice().mut_slice_to(end)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns a pair of mutable slices that divides the vec at an index.
|
|
|
|
///
|
|
|
|
/// The first will contain all indices from `[0, mid)` (excluding
|
|
|
|
/// the index `mid` itself) and the second will contain all
|
|
|
|
/// indices from `[mid, len)` (excluding the index `len` itself).
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if `mid > len`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 3, 4, 5, 6);
|
|
|
|
///
|
|
|
|
/// // scoped to restrict the lifetime of the borrows
|
|
|
|
/// {
|
|
|
|
/// let (left, right) = vec.mut_split_at(0);
|
|
|
|
/// assert!(left == &mut []);
|
|
|
|
/// assert!(right == &mut [1, 2, 3, 4, 5, 6]);
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// {
|
|
|
|
/// let (left, right) = vec.mut_split_at(2);
|
|
|
|
/// assert!(left == &mut [1, 2]);
|
|
|
|
/// assert!(right == &mut [3, 4, 5, 6]);
|
|
|
|
/// }
|
|
|
|
///
|
|
|
|
/// {
|
|
|
|
/// let (left, right) = vec.mut_split_at(6);
|
|
|
|
/// assert!(left == &mut [1, 2, 3, 4, 5, 6]);
|
|
|
|
/// assert!(right == &mut []);
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
pub fn mut_split_at<'a>(&'a mut self, mid: uint) -> (&'a mut [T], &'a mut [T]) {
|
|
|
|
self.as_mut_slice().mut_split_at(mid)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Reverse the order of elements in a vector, in place.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut v = vec!(1, 2, 3);
|
|
|
|
/// v.reverse();
|
|
|
|
/// assert_eq!(v, vec!(3, 2, 1));
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn reverse(&mut self) {
|
|
|
|
self.as_mut_slice().reverse()
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a slice of `self` from `start` to the end of the vec.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when `start` points outside the bounds of self.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.slice_from(1) == [2, 3]);
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
2014-02-18 23:36:51 -06:00
|
|
|
pub fn slice_from<'a>(&'a self, start: uint) -> &'a [T] {
|
|
|
|
self.as_slice().slice_from(start)
|
|
|
|
}
|
2014-02-28 14:55:51 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a slice of self from the start of the vec to `end`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails when `end` points outside the bounds of self.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.slice_to(2) == [1, 2]);
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn slice_to<'a>(&'a self, end: uint) -> &'a [T] {
|
|
|
|
self.as_slice().slice_to(end)
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a slice containing all but the last element of the vector.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
|
|
|
/// Fails if the vector is empty
|
2014-02-28 14:55:51 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn init<'a>(&'a self) -> &'a [T] {
|
|
|
|
self.slice(0, self.len() - 1)
|
|
|
|
}
|
2014-03-04 12:39:49 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
|
|
|
|
/// Returns an unsafe pointer to the vector's buffer.
|
|
|
|
///
|
|
|
|
/// The caller must ensure that the vector outlives the pointer this
|
|
|
|
/// function returns, or else it will end up pointing to garbage.
|
|
|
|
///
|
|
|
|
/// Modifying the vector may cause its buffer to be reallocated, which
|
|
|
|
/// would also make any pointers to it invalid.
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
|
|
|
pub fn as_ptr(&self) -> *T {
|
2014-04-17 17:28:14 -05:00
|
|
|
// If we have a 0-sized vector, then the base pointer should not be NULL
|
|
|
|
// because an iterator over the slice will attempt to yield the base
|
|
|
|
// pointer as the first element in the vector, but this will end up
|
|
|
|
// being Some(NULL) which is optimized to None.
|
|
|
|
if mem::size_of::<T>() == 0 {
|
|
|
|
1 as *T
|
|
|
|
} else {
|
|
|
|
self.ptr as *T
|
|
|
|
}
|
2014-03-04 12:39:49 -06:00
|
|
|
}
|
2014-03-16 16:20:44 -05:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Returns a mutable unsafe pointer to the vector's buffer.
|
|
|
|
///
|
|
|
|
/// The caller must ensure that the vector outlives the pointer this
|
|
|
|
/// function returns, or else it will end up pointing to garbage.
|
|
|
|
///
|
|
|
|
/// Modifying the vector may cause its buffer to be reallocated, which
|
|
|
|
/// would also make any pointers to it invalid.
|
2014-03-16 16:20:44 -05:00
|
|
|
#[inline]
|
|
|
|
pub fn as_mut_ptr(&mut self) -> *mut T {
|
2014-04-17 17:28:14 -05:00
|
|
|
// see above for the 0-size check
|
|
|
|
if mem::size_of::<T>() == 0 {
|
|
|
|
1 as *mut T
|
|
|
|
} else {
|
|
|
|
self.ptr
|
|
|
|
}
|
2014-03-16 16:20:44 -05:00
|
|
|
}
|
2014-04-02 22:10:36 -05:00
|
|
|
|
|
|
|
/// Retains only the elements specified by the predicate.
|
|
|
|
///
|
|
|
|
/// In other words, remove all elements `e` such that `f(&e)` returns false.
|
|
|
|
/// This method operates in place and preserves the order the retained elements.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1i, 2, 3, 4);
|
|
|
|
/// vec.retain(|x| x%2 == 0);
|
|
|
|
/// assert_eq!(vec, vec!(2, 4));
|
|
|
|
/// ```
|
|
|
|
pub fn retain(&mut self, f: |&T| -> bool) {
|
|
|
|
let len = self.len();
|
|
|
|
let mut del = 0u;
|
|
|
|
{
|
|
|
|
let v = self.as_mut_slice();
|
|
|
|
|
|
|
|
for i in range(0u, len) {
|
|
|
|
if !f(&v[i]) {
|
|
|
|
del += 1;
|
|
|
|
} else if del > 0 {
|
|
|
|
v.swap(i-del, i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if del > 0 {
|
|
|
|
self.truncate(len - del);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Expands a vector in place, initializing the new elements to the result of a function.
|
|
|
|
///
|
|
|
|
/// The vector is grown by `n` elements. The i-th new element are initialized to the value
|
|
|
|
/// returned by `f(i)` where `i` is in the range [0, n).
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(0u, 1);
|
|
|
|
/// vec.grow_fn(3, |i| i);
|
|
|
|
/// assert_eq!(vec, vec!(0, 1, 0, 1, 2));
|
|
|
|
/// ```
|
|
|
|
pub fn grow_fn(&mut self, n: uint, f: |uint| -> T) {
|
|
|
|
self.reserve_additional(n);
|
|
|
|
for i in range(0u, n) {
|
|
|
|
self.push(f(i));
|
|
|
|
}
|
|
|
|
}
|
2014-03-08 14:47:12 -06:00
|
|
|
}
|
2014-03-04 12:39:49 -06:00
|
|
|
|
2014-05-31 12:43:52 -05:00
|
|
|
impl<T:Ord> Vec<T> {
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Sorts the vector in place.
|
|
|
|
///
|
|
|
|
/// This sort is `O(n log n)` worst-case and stable, but allocates
|
|
|
|
/// approximately `2 * n`, where `n` is the length of `self`.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(3i, 1, 2);
|
|
|
|
/// vec.sort();
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3));
|
|
|
|
/// ```
|
|
|
|
pub fn sort(&mut self) {
|
|
|
|
self.as_mut_slice().sort()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-08 14:47:12 -06:00
|
|
|
impl<T> Mutable for Vec<T> {
|
2014-03-04 12:39:49 -06:00
|
|
|
#[inline]
|
2014-03-08 14:47:12 -06:00
|
|
|
fn clear(&mut self) {
|
2014-03-04 12:39:49 -06:00
|
|
|
self.truncate(0)
|
|
|
|
}
|
2014-02-28 14:55:51 -06:00
|
|
|
}
|
|
|
|
|
2014-05-29 19:45:07 -05:00
|
|
|
impl<T:PartialEq> Vec<T> {
|
2014-02-28 14:55:51 -06:00
|
|
|
/// Return true if a vector contains an element with the given value
|
2014-03-16 18:04:29 -05:00
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let vec = vec!(1, 2, 3);
|
|
|
|
/// assert!(vec.contains(&1));
|
|
|
|
/// ```
|
2014-02-28 14:55:51 -06:00
|
|
|
pub fn contains(&self, x: &T) -> bool {
|
|
|
|
self.as_slice().contains(x)
|
|
|
|
}
|
2014-03-04 12:39:49 -06:00
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// Remove consecutive repeated elements in the vector.
|
|
|
|
///
|
|
|
|
/// If the vector is sorted, this removes all duplicates.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// let mut vec = vec!(1, 2, 2, 3, 2);
|
|
|
|
/// vec.dedup();
|
|
|
|
/// assert_eq!(vec, vec!(1, 2, 3, 2));
|
|
|
|
/// ```
|
2014-03-04 12:39:49 -06:00
|
|
|
pub fn dedup(&mut self) {
|
|
|
|
unsafe {
|
|
|
|
// Although we have a mutable reference to `self`, we cannot make
|
2014-05-29 19:45:07 -05:00
|
|
|
// *arbitrary* changes. The `PartialEq` comparisons could fail, so we
|
2014-03-04 12:39:49 -06:00
|
|
|
// must ensure that the vector is in a valid state at all time.
|
|
|
|
//
|
|
|
|
// The way that we handle this is by using swaps; we iterate
|
|
|
|
// over all the elements, swapping as we go so that at the end
|
|
|
|
// the elements we wish to keep are in the front, and those we
|
|
|
|
// wish to reject are at the back. We can then truncate the
|
|
|
|
// vector. This operation is still O(n).
|
|
|
|
//
|
|
|
|
// Example: We start in this state, where `r` represents "next
|
|
|
|
// read" and `w` represents "next_write`.
|
|
|
|
//
|
|
|
|
// r
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// | 0 | 1 | 1 | 2 | 3 | 3 |
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// w
|
|
|
|
//
|
2014-04-28 08:39:11 -05:00
|
|
|
// Comparing self[r] against self[w-1], this is not a duplicate, so
|
2014-03-04 12:39:49 -06:00
|
|
|
// we swap self[r] and self[w] (no effect as r==w) and then increment both
|
|
|
|
// r and w, leaving us with:
|
|
|
|
//
|
|
|
|
// r
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// | 0 | 1 | 1 | 2 | 3 | 3 |
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// w
|
|
|
|
//
|
|
|
|
// Comparing self[r] against self[w-1], this value is a duplicate,
|
|
|
|
// so we increment `r` but leave everything else unchanged:
|
|
|
|
//
|
|
|
|
// r
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// | 0 | 1 | 1 | 2 | 3 | 3 |
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// w
|
|
|
|
//
|
|
|
|
// Comparing self[r] against self[w-1], this is not a duplicate,
|
|
|
|
// so swap self[r] and self[w] and advance r and w:
|
|
|
|
//
|
|
|
|
// r
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// | 0 | 1 | 2 | 1 | 3 | 3 |
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// w
|
|
|
|
//
|
|
|
|
// Not a duplicate, repeat:
|
|
|
|
//
|
|
|
|
// r
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// | 0 | 1 | 2 | 3 | 1 | 3 |
|
|
|
|
// +---+---+---+---+---+---+
|
|
|
|
// w
|
|
|
|
//
|
|
|
|
// Duplicate, advance r. End of vec. Truncate to w.
|
|
|
|
|
|
|
|
let ln = self.len();
|
|
|
|
if ln < 1 { return; }
|
|
|
|
|
|
|
|
// Avoid bounds checks by using unsafe pointers.
|
|
|
|
let p = self.as_mut_slice().as_mut_ptr();
|
|
|
|
let mut r = 1;
|
|
|
|
let mut w = 1;
|
|
|
|
|
|
|
|
while r < ln {
|
|
|
|
let p_r = p.offset(r as int);
|
|
|
|
let p_wm1 = p.offset((w - 1) as int);
|
|
|
|
if *p_r != *p_wm1 {
|
|
|
|
if r != w {
|
|
|
|
let p_w = p_wm1.offset(1);
|
|
|
|
mem::swap(&mut *p_r, &mut *p_w);
|
|
|
|
}
|
|
|
|
w += 1;
|
|
|
|
}
|
|
|
|
r += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
self.truncate(w);
|
|
|
|
}
|
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
2014-03-06 12:22:21 -06:00
|
|
|
impl<T> Vector<T> for Vec<T> {
|
|
|
|
/// Work with `self` as a slice.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// fn foo(slice: &[int]) {}
|
|
|
|
///
|
|
|
|
/// let vec = vec!(1, 2);
|
|
|
|
/// foo(vec.as_slice());
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
fn as_slice<'a>(&'a self) -> &'a [T] {
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
unsafe { mem::transmute(Slice { data: self.as_ptr(), len: self.len }) }
|
2014-03-06 12:22:21 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-04 01:09:45 -05:00
|
|
|
impl<T: Clone, V: Vector<T>> Add<V, Vec<T>> for Vec<T> {
|
|
|
|
#[inline]
|
|
|
|
fn add(&self, rhs: &V) -> Vec<T> {
|
|
|
|
let mut res = Vec::with_capacity(self.len() + rhs.as_slice().len());
|
|
|
|
res.push_all(self.as_slice());
|
|
|
|
res.push_all(rhs.as_slice());
|
|
|
|
res
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-21 08:35:11 -06:00
|
|
|
#[unsafe_destructor]
|
|
|
|
impl<T> Drop for Vec<T> {
|
|
|
|
fn drop(&mut self) {
|
2014-03-12 15:01:33 -05:00
|
|
|
// This is (and should always remain) a no-op if the fields are
|
|
|
|
// zeroed (when moving out, because of #[unsafe_no_drop_flag]).
|
2014-05-06 16:01:16 -05:00
|
|
|
if self.cap != 0 {
|
|
|
|
unsafe {
|
|
|
|
for x in self.as_mut_slice().iter() {
|
|
|
|
ptr::read(x);
|
|
|
|
}
|
2014-05-09 23:35:56 -05:00
|
|
|
dealloc(self.ptr, self.cap)
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-28 14:55:51 -06:00
|
|
|
impl<T> Default for Vec<T> {
|
|
|
|
fn default() -> Vec<T> {
|
|
|
|
Vec::new()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-28 14:54:01 -06:00
|
|
|
impl<T:fmt::Show> fmt::Show for Vec<T> {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
self.as_slice().fmt(f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-16 18:04:29 -05:00
|
|
|
/// An iterator that moves out of a vector.
|
2014-01-21 08:35:11 -06:00
|
|
|
pub struct MoveItems<T> {
|
2014-05-09 23:35:56 -05:00
|
|
|
allocation: *mut T, // the block of memory allocated for the vector
|
2014-05-06 16:01:16 -05:00
|
|
|
cap: uint, // the capacity of the vector
|
2014-03-27 17:09:47 -05:00
|
|
|
iter: Items<'static, T>
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> Iterator<T> for MoveItems<T> {
|
|
|
|
#[inline]
|
|
|
|
fn next(&mut self) -> Option<T> {
|
|
|
|
unsafe {
|
2014-02-14 17:42:01 -06:00
|
|
|
self.iter.next().map(|x| ptr::read(x))
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn size_hint(&self) -> (uint, Option<uint>) {
|
|
|
|
self.iter.size_hint()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> DoubleEndedIterator<T> for MoveItems<T> {
|
|
|
|
#[inline]
|
|
|
|
fn next_back(&mut self) -> Option<T> {
|
|
|
|
unsafe {
|
2014-02-14 17:42:01 -06:00
|
|
|
self.iter.next_back().map(|x| ptr::read(x))
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[unsafe_destructor]
|
|
|
|
impl<T> Drop for MoveItems<T> {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
// destroy the remaining elements
|
2014-05-06 16:01:16 -05:00
|
|
|
if self.cap != 0 {
|
|
|
|
for _x in *self {}
|
|
|
|
unsafe {
|
2014-05-09 23:35:56 -05:00
|
|
|
dealloc(self.allocation, self.cap);
|
2014-05-06 16:01:16 -05:00
|
|
|
}
|
2014-01-21 08:35:11 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-03-03 14:46:24 -06:00
|
|
|
|
2014-05-03 20:10:04 -05:00
|
|
|
/**
|
|
|
|
* Convert an iterator of pairs into a pair of vectors.
|
|
|
|
*
|
|
|
|
* Returns a tuple containing two vectors where the i-th element of the first
|
|
|
|
* vector contains the first element of the i-th tuple of the input iterator,
|
|
|
|
* and the i-th element of the second vector contains the second element
|
|
|
|
* of the i-th tuple of the input iterator.
|
|
|
|
*/
|
|
|
|
pub fn unzip<T, U, V: Iterator<(T, U)>>(mut iter: V) -> (Vec<T>, Vec<U>) {
|
|
|
|
let (lo, _) = iter.size_hint();
|
|
|
|
let mut ts = Vec::with_capacity(lo);
|
|
|
|
let mut us = Vec::with_capacity(lo);
|
|
|
|
for (t, u) in iter {
|
|
|
|
ts.push(t);
|
|
|
|
us.push(u);
|
|
|
|
}
|
|
|
|
(ts, us)
|
|
|
|
}
|
|
|
|
|
2014-05-06 22:14:54 -05:00
|
|
|
/// Mechanism to convert from a `Vec<T>` to a `[T]`.
|
|
|
|
///
|
|
|
|
/// In a post-DST world this will be used to convert to any `Ptr<[T]>`.
|
|
|
|
///
|
|
|
|
/// This could be implemented on more types than just pointers to vectors, but
|
|
|
|
/// the recommended approach for those types is to implement `FromIterator`.
|
|
|
|
// FIXME(#12938): Update doc comment when DST lands
|
|
|
|
pub trait FromVec<T> {
|
|
|
|
/// Convert a `Vec<T>` into the receiver type.
|
|
|
|
fn from_vec(v: Vec<T>) -> Self;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> FromVec<T> for ~[T] {
|
|
|
|
fn from_vec(mut v: Vec<T>) -> ~[T] {
|
|
|
|
let len = v.len();
|
|
|
|
let data_size = len.checked_mul(&mem::size_of::<T>());
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
let data_size = ::expect(data_size, "overflow in from_vec()");
|
2014-05-06 22:14:54 -05:00
|
|
|
let size = mem::size_of::<RawVec<()>>().checked_add(&data_size);
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
let size = ::expect(size, "overflow in from_vec()");
|
2014-05-06 22:14:54 -05:00
|
|
|
|
|
|
|
// In a post-DST world, we can attempt to reuse the Vec allocation by calling
|
|
|
|
// shrink_to_fit() on it. That may involve a reallocation+memcpy, but that's no
|
|
|
|
// diffrent than what we're doing manually here.
|
|
|
|
|
|
|
|
let vp = v.as_mut_ptr();
|
|
|
|
|
|
|
|
unsafe {
|
2014-05-06 21:03:14 -05:00
|
|
|
let ret = allocate(size, 8) as *mut RawVec<()>;
|
2014-05-06 22:14:54 -05:00
|
|
|
|
2014-05-17 02:56:00 -05:00
|
|
|
let a_size = mem::size_of::<T>();
|
|
|
|
let a_size = if a_size == 0 {1} else {a_size};
|
|
|
|
(*ret).fill = len * a_size;
|
|
|
|
(*ret).alloc = len * a_size;
|
2014-05-06 22:14:54 -05:00
|
|
|
|
|
|
|
ptr::copy_nonoverlapping_memory(&mut (*ret).data as *mut _ as *mut u8,
|
|
|
|
vp as *u8, data_size);
|
|
|
|
|
|
|
|
// we've transferred ownership of the contents from v, but we can't drop it
|
|
|
|
// as it still needs to free its own allocation.
|
|
|
|
v.set_len(0);
|
|
|
|
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 12:34:51 -05:00
|
|
|
mem::transmute(ret)
|
2014-05-06 22:14:54 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-03 20:20:35 -05:00
|
|
|
/// Unsafe operations
|
|
|
|
pub mod raw {
|
|
|
|
use super::Vec;
|
std: Recreate a `collections` module
As with the previous commit with `librand`, this commit shuffles around some
`collections` code. The new state of the world is similar to that of librand:
* The libcollections crate now only depends on libcore and liballoc.
* The standard library has a new module, `std::collections`. All functionality
of libcollections is reexported through this module.
I would like to stress that this change is purely cosmetic. There are very few
alterations to these primitives.
There are a number of notable points about the new organization:
* std::{str, slice, string, vec} all moved to libcollections. There is no reason
that these primitives shouldn't be necessarily usable in a freestanding
context that has allocation. These are all reexported in their usual places in
the standard library.
* The `hashmap`, and transitively the `lru_cache`, modules no longer reside in
`libcollections`, but rather in libstd. The reason for this is because the
`HashMap::new` contructor requires access to the OSRng for initially seeding
the hash map. Beyond this requirement, there is no reason that the hashmap
could not move to libcollections.
I do, however, have a plan to move the hash map to the collections module. The
`HashMap::new` function could be altered to require that the `H` hasher
parameter ascribe to the `Default` trait, allowing the entire `hashmap` module
to live in libcollections. The key idea would be that the default hasher would
be different in libstd. Something along the lines of:
// src/libstd/collections/mod.rs
pub type HashMap<K, V, H = RandomizedSipHasher> =
core_collections::HashMap<K, V, H>;
This is not possible today because you cannot invoke static methods through
type aliases. If we modified the compiler, however, to allow invocation of
static methods through type aliases, then this type definition would
essentially be switching the default hasher from `SipHasher` in libcollections
to a libstd-defined `RandomizedSipHasher` type. This type's `Default`
implementation would randomly seed the `SipHasher` instance, and otherwise
perform the same as `SipHasher`.
This future state doesn't seem incredibly far off, but until that time comes,
the hashmap module will live in libstd to not compromise on functionality.
* In preparation for the hashmap moving to libcollections, the `hash` module has
moved from libstd to libcollections. A previously snapshotted commit enables a
distinct `Writer` trait to live in the `hash` module which `Hash`
implementations are now parameterized over.
Due to using a custom trait, the `SipHasher` implementation has lost its
specialized methods for writing integers. These can be re-added
backwards-compatibly in the future via default methods if necessary, but the
FNV hashing should satisfy much of the need for speedier hashing.
A list of breaking changes:
* HashMap::{get, get_mut} no longer fails with the key formatted into the error
message with `{:?}`, instead, a generic message is printed. With backtraces,
it should still be not-too-hard to track down errors.
* The HashMap, HashSet, and LruCache types are now available through
std::collections instead of the collections crate.
* Manual implementations of hash should be parameterized over `hash::Writer`
instead of just `Writer`.
[breaking-change]
2014-05-29 20:50:12 -05:00
|
|
|
use core::ptr;
|
2014-05-03 20:20:35 -05:00
|
|
|
|
|
|
|
/// Constructs a vector from an unsafe pointer to a buffer.
|
|
|
|
///
|
|
|
|
/// The elements of the buffer are copied into the vector without cloning,
|
|
|
|
/// as if `ptr::read()` were called on them.
|
|
|
|
#[inline]
|
|
|
|
pub unsafe fn from_buf<T>(ptr: *T, elts: uint) -> Vec<T> {
|
|
|
|
let mut dst = Vec::with_capacity(elts);
|
|
|
|
dst.set_len(elts);
|
|
|
|
ptr::copy_nonoverlapping_memory(dst.as_mut_ptr(), ptr, elts);
|
|
|
|
dst
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-03 20:10:04 -05:00
|
|
|
|
2014-03-03 14:46:24 -06:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2014-03-17 16:34:25 -05:00
|
|
|
use prelude::*;
|
|
|
|
use mem::size_of;
|
2014-05-06 22:14:54 -05:00
|
|
|
use kinds::marker;
|
|
|
|
use super::{unzip, raw, FromVec};
|
2014-03-12 15:01:33 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_small_vec_struct() {
|
|
|
|
assert!(size_of::<Vec<u8>>() == size_of::<uint>() * 3);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_double_drop() {
|
|
|
|
struct TwoVec<T> {
|
|
|
|
x: Vec<T>,
|
|
|
|
y: Vec<T>
|
|
|
|
}
|
|
|
|
|
|
|
|
struct DropCounter<'a> {
|
|
|
|
count: &'a mut int
|
|
|
|
}
|
|
|
|
|
|
|
|
#[unsafe_destructor]
|
|
|
|
impl<'a> Drop for DropCounter<'a> {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
*self.count += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut count_x @ mut count_y = 0;
|
|
|
|
{
|
|
|
|
let mut tv = TwoVec {
|
|
|
|
x: Vec::new(),
|
|
|
|
y: Vec::new()
|
|
|
|
};
|
|
|
|
tv.x.push(DropCounter {count: &mut count_x});
|
|
|
|
tv.y.push(DropCounter {count: &mut count_y});
|
|
|
|
|
|
|
|
// If Vec had a drop flag, here is where it would be zeroed.
|
|
|
|
// Instead, it should rely on its internal state to prevent
|
|
|
|
// doing anything significant when dropped multiple times.
|
|
|
|
drop(tv.x);
|
|
|
|
|
|
|
|
// Here tv goes out of scope, tv.y should be dropped, but not tv.x.
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_eq!(count_x, 1);
|
|
|
|
assert_eq!(count_y, 1);
|
|
|
|
}
|
2014-03-03 14:46:24 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_reserve_additional() {
|
|
|
|
let mut v = Vec::new();
|
|
|
|
assert_eq!(v.capacity(), 0);
|
|
|
|
|
|
|
|
v.reserve_additional(2);
|
|
|
|
assert!(v.capacity() >= 2);
|
|
|
|
|
|
|
|
for i in range(0, 16) {
|
|
|
|
v.push(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
assert!(v.capacity() >= 16);
|
|
|
|
v.reserve_additional(16);
|
|
|
|
assert!(v.capacity() >= 32);
|
|
|
|
|
|
|
|
v.push(16);
|
|
|
|
|
|
|
|
v.reserve_additional(16);
|
|
|
|
assert!(v.capacity() >= 33)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_extend() {
|
|
|
|
let mut v = Vec::new();
|
|
|
|
let mut w = Vec::new();
|
|
|
|
|
2014-03-20 08:12:56 -05:00
|
|
|
v.extend(range(0, 3));
|
2014-03-03 14:46:24 -06:00
|
|
|
for i in range(0, 3) { w.push(i) }
|
|
|
|
|
|
|
|
assert_eq!(v, w);
|
|
|
|
|
2014-03-20 08:12:56 -05:00
|
|
|
v.extend(range(3, 10));
|
2014-03-03 14:46:24 -06:00
|
|
|
for i in range(3, 10) { w.push(i) }
|
|
|
|
|
|
|
|
assert_eq!(v, w);
|
|
|
|
}
|
2014-03-17 22:52:06 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_mut_slice_from() {
|
|
|
|
let mut values = Vec::from_slice([1u8,2,3,4,5]);
|
|
|
|
{
|
|
|
|
let slice = values.mut_slice_from(2);
|
|
|
|
assert!(slice == [3, 4, 5]);
|
|
|
|
for p in slice.mut_iter() {
|
|
|
|
*p += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert!(values.as_slice() == [1, 2, 5, 6, 7]);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_mut_slice_to() {
|
|
|
|
let mut values = Vec::from_slice([1u8,2,3,4,5]);
|
|
|
|
{
|
|
|
|
let slice = values.mut_slice_to(2);
|
|
|
|
assert!(slice == [1, 2]);
|
|
|
|
for p in slice.mut_iter() {
|
|
|
|
*p += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert!(values.as_slice() == [2, 3, 3, 4, 5]);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_mut_split_at() {
|
|
|
|
let mut values = Vec::from_slice([1u8,2,3,4,5]);
|
|
|
|
{
|
|
|
|
let (left, right) = values.mut_split_at(2);
|
|
|
|
assert!(left.slice(0, left.len()) == [1, 2]);
|
|
|
|
for p in left.mut_iter() {
|
|
|
|
*p += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert!(right.slice(0, right.len()) == [3, 4, 5]);
|
|
|
|
for p in right.mut_iter() {
|
|
|
|
*p += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert!(values == Vec::from_slice([2u8, 3, 5, 6, 7]));
|
|
|
|
}
|
2014-04-03 06:28:45 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_clone() {
|
|
|
|
let v: Vec<int> = vec!();
|
|
|
|
let w = vec!(1, 2, 3);
|
|
|
|
|
|
|
|
assert_eq!(v, v.clone());
|
|
|
|
|
|
|
|
let z = w.clone();
|
|
|
|
assert_eq!(w, z);
|
|
|
|
// they should be disjoint in memory.
|
|
|
|
assert!(w.as_ptr() != z.as_ptr())
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_clone_from() {
|
|
|
|
let mut v = vec!();
|
2014-04-25 03:08:02 -05:00
|
|
|
let three = vec!(box 1, box 2, box 3);
|
|
|
|
let two = vec!(box 4, box 5);
|
2014-04-03 06:28:45 -05:00
|
|
|
// zero, long
|
|
|
|
v.clone_from(&three);
|
|
|
|
assert_eq!(v, three);
|
|
|
|
|
|
|
|
// equal
|
|
|
|
v.clone_from(&three);
|
|
|
|
assert_eq!(v, three);
|
|
|
|
|
|
|
|
// long, short
|
|
|
|
v.clone_from(&two);
|
|
|
|
assert_eq!(v, two);
|
|
|
|
|
|
|
|
// short, long
|
|
|
|
v.clone_from(&three);
|
|
|
|
assert_eq!(v, three)
|
|
|
|
}
|
2014-04-02 22:10:36 -05:00
|
|
|
|
2014-04-07 15:30:48 -05:00
|
|
|
#[test]
|
2014-04-02 22:10:36 -05:00
|
|
|
fn test_grow_fn() {
|
|
|
|
let mut v = Vec::from_slice([0u, 1]);
|
|
|
|
v.grow_fn(3, |i| i);
|
|
|
|
assert!(v == Vec::from_slice([0u, 1, 0, 1, 2]));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_retain() {
|
|
|
|
let mut vec = Vec::from_slice([1u, 2, 3, 4]);
|
|
|
|
vec.retain(|x| x%2 == 0);
|
|
|
|
assert!(vec == Vec::from_slice([2u, 4]));
|
|
|
|
}
|
2014-04-11 16:34:21 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn zero_sized_values() {
|
|
|
|
let mut v = Vec::new();
|
|
|
|
assert_eq!(v.len(), 0);
|
|
|
|
v.push(());
|
|
|
|
assert_eq!(v.len(), 1);
|
|
|
|
v.push(());
|
|
|
|
assert_eq!(v.len(), 2);
|
|
|
|
assert_eq!(v.pop(), Some(()));
|
|
|
|
assert_eq!(v.pop(), Some(()));
|
|
|
|
assert_eq!(v.pop(), None);
|
|
|
|
|
|
|
|
assert_eq!(v.iter().len(), 0);
|
|
|
|
v.push(());
|
|
|
|
assert_eq!(v.iter().len(), 1);
|
|
|
|
v.push(());
|
|
|
|
assert_eq!(v.iter().len(), 2);
|
|
|
|
|
|
|
|
for &() in v.iter() {}
|
|
|
|
|
|
|
|
assert_eq!(v.mut_iter().len(), 2);
|
|
|
|
v.push(());
|
|
|
|
assert_eq!(v.mut_iter().len(), 3);
|
|
|
|
v.push(());
|
|
|
|
assert_eq!(v.mut_iter().len(), 4);
|
|
|
|
|
|
|
|
for &() in v.mut_iter() {}
|
|
|
|
unsafe { v.set_len(0); }
|
|
|
|
assert_eq!(v.mut_iter().len(), 0);
|
|
|
|
}
|
2014-05-03 18:13:35 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_partition() {
|
|
|
|
assert_eq!(vec![].partition(|x: &int| *x < 3), (vec![], vec![]));
|
|
|
|
assert_eq!(vec![1, 2, 3].partition(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
|
|
|
|
assert_eq!(vec![1, 2, 3].partition(|x: &int| *x < 2), (vec![1], vec![2, 3]));
|
|
|
|
assert_eq!(vec![1, 2, 3].partition(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_partitioned() {
|
2014-05-08 14:03:33 -05:00
|
|
|
assert_eq!(vec![].partitioned(|x: &int| *x < 3), (vec![], vec![]))
|
|
|
|
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
|
|
|
|
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 2), (vec![1], vec![2, 3]));
|
|
|
|
assert_eq!(vec![1, 2, 3].partitioned(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
|
2014-05-03 18:13:35 -05:00
|
|
|
}
|
2014-05-03 20:10:04 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_zip_unzip() {
|
|
|
|
let z1 = vec![(1, 4), (2, 5), (3, 6)];
|
|
|
|
|
|
|
|
let (left, right) = unzip(z1.iter().map(|&x| x));
|
|
|
|
|
|
|
|
let (left, right) = (left.as_slice(), right.as_slice());
|
|
|
|
assert_eq!((1, 4), (left[0], right[0]));
|
|
|
|
assert_eq!((2, 5), (left[1], right[1]));
|
|
|
|
assert_eq!((3, 6), (left[2], right[2]));
|
|
|
|
}
|
2014-05-03 20:20:35 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_unsafe_ptrs() {
|
|
|
|
unsafe {
|
|
|
|
// Test on-stack copy-from-buf.
|
|
|
|
let a = [1, 2, 3];
|
|
|
|
let ptr = a.as_ptr();
|
|
|
|
let b = raw::from_buf(ptr, 3u);
|
|
|
|
assert_eq!(b, vec![1, 2, 3]);
|
|
|
|
|
|
|
|
// Test on-heap copy-from-buf.
|
|
|
|
let c = box [1, 2, 3, 4, 5];
|
|
|
|
let ptr = c.as_ptr();
|
|
|
|
let d = raw::from_buf(ptr, 5u);
|
|
|
|
assert_eq!(d, vec![1, 2, 3, 4, 5]);
|
|
|
|
}
|
|
|
|
}
|
2014-05-06 22:14:54 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_from_vec() {
|
|
|
|
let a = vec![1u, 2, 3];
|
|
|
|
let b: ~[uint] = FromVec::from_vec(a);
|
|
|
|
assert_eq!(b.as_slice(), &[1u, 2, 3]);
|
|
|
|
|
|
|
|
let a = vec![];
|
|
|
|
let b: ~[u8] = FromVec::from_vec(a);
|
|
|
|
assert_eq!(b.as_slice(), &[]);
|
|
|
|
|
2014-05-25 05:17:19 -05:00
|
|
|
let a = vec!["one".to_string(), "two".to_string()];
|
2014-05-22 18:57:53 -05:00
|
|
|
let b: ~[String] = FromVec::from_vec(a);
|
2014-05-25 05:17:19 -05:00
|
|
|
assert_eq!(b.as_slice(), &["one".to_string(), "two".to_string()]);
|
2014-05-06 22:14:54 -05:00
|
|
|
|
|
|
|
struct Foo {
|
|
|
|
x: uint,
|
|
|
|
nocopy: marker::NoCopy
|
|
|
|
}
|
|
|
|
|
|
|
|
let a = vec![Foo{x: 42, nocopy: marker::NoCopy}, Foo{x: 84, nocopy: marker::NoCopy}];
|
|
|
|
let b: ~[Foo] = FromVec::from_vec(a);
|
|
|
|
assert_eq!(b.len(), 2);
|
|
|
|
assert_eq!(b[0].x, 42);
|
|
|
|
assert_eq!(b[1].x, 84);
|
|
|
|
}
|
2014-05-14 16:57:27 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_vec_truncate_drop() {
|
|
|
|
static mut drops: uint = 0;
|
|
|
|
struct Elem(int);
|
|
|
|
impl Drop for Elem {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
unsafe { drops += 1; }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut v = vec![Elem(1), Elem(2), Elem(3), Elem(4), Elem(5)];
|
|
|
|
assert_eq!(unsafe { drops }, 0);
|
|
|
|
v.truncate(3);
|
|
|
|
assert_eq!(unsafe { drops }, 2);
|
|
|
|
v.truncate(0);
|
|
|
|
assert_eq!(unsafe { drops }, 5);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
#[should_fail]
|
|
|
|
fn test_vec_truncate_fail() {
|
|
|
|
struct BadElem(int);
|
|
|
|
impl Drop for BadElem {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
let BadElem(ref mut x) = *self;
|
|
|
|
if *x == 0xbadbeef {
|
|
|
|
fail!("BadElem failure: 0xbadbeef")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut v = vec![BadElem(1), BadElem(2), BadElem(0xbadbeef), BadElem(4)];
|
|
|
|
v.truncate(0);
|
|
|
|
}
|
2014-03-03 14:46:24 -06:00
|
|
|
}
|