Skip to content

Commit

Permalink
libstd: Add some functionality to Vec<T>
Browse files Browse the repository at this point in the history
  • Loading branch information
pcwalton committed Mar 2, 2014
1 parent c81b3fb commit df40aec
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/libstd/hash/mod.rs
Expand Up @@ -70,6 +70,7 @@ use option::{Option, Some, None};
use rc::Rc;
use str::{Str, StrSlice};
use vec::{Vector, ImmutableVector};
use vec_ng::Vec;

/// Reexport the `sip::hash` function as our default hasher.
pub use hash = self::sip::hash;
Expand Down Expand Up @@ -207,6 +208,13 @@ impl<S: Writer, T: Hash<S>> Hash<S> for ~[T] {
}
}

impl<S: Writer, T: Hash<S>> Hash<S> for Vec<T> {
#[inline]
fn hash(&self, state: &mut S) {
self.as_slice().hash(state);
}
}

impl<'a, S: Writer, T: Hash<S>> Hash<S> for &'a T {
#[inline]
fn hash(&self, state: &mut S) {
Expand Down
30 changes: 29 additions & 1 deletion src/libstd/vec_ng.rs
Expand Up @@ -15,6 +15,7 @@ use cast::{forget, transmute};
use clone::Clone;
use cmp::{Eq, Ordering, TotalEq, TotalOrd};
use container::Container;
use default::Default;
use iter::{DoubleEndedIterator, FromIterator, Iterator};
use libc::{free, c_void};
use mem::{size_of, move_val_init};
Expand All @@ -26,7 +27,8 @@ use ptr::RawPtr;
use ptr;
use rt::global_heap::{malloc_raw, realloc_raw};
use raw::Slice;
use vec::{ImmutableVector, Items, MutItems, MutableVector, RevItems};
use vec::{ImmutableEqVector, ImmutableVector, Items, MutItems, MutableVector};
use vec::{RevItems};

pub struct Vec<T> {
priv len: uint,
Expand Down Expand Up @@ -340,6 +342,18 @@ impl<T> Vec<T> {
pub fn slice_from<'a>(&'a self, start: uint) -> &'a [T] {
self.as_slice().slice_from(start)
}

#[inline]
pub fn init<'a>(&'a self) -> &'a [T] {
self.slice(0, self.len() - 1)
}
}

impl<T:Eq> Vec<T> {
/// Return true if a vector contains an element with the given value
pub fn contains(&self, x: &T) -> bool {
self.as_slice().contains(x)
}
}

#[inline]
Expand All @@ -348,6 +362,14 @@ pub fn append<T:Clone>(mut first: Vec<T>, second: &[T]) -> Vec<T> {
first
}

/// Appends one element to the vector provided. The vector itself is then
/// returned for use again.
#[inline]
pub fn append_one<T>(mut lhs: Vec<T>, x: T) -> Vec<T> {
lhs.push(x);
lhs
}

#[unsafe_destructor]
impl<T> Drop for Vec<T> {
fn drop(&mut self) {
Expand All @@ -360,6 +382,12 @@ impl<T> Drop for Vec<T> {
}
}

impl<T> Default for Vec<T> {
fn default() -> Vec<T> {
Vec::new()
}
}

pub struct MoveItems<T> {
priv allocation: *mut c_void, // the block of memory allocated for the vector
priv iter: Items<'static, T>
Expand Down

0 comments on commit df40aec

Please sign in to comment.