Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
2013-01-31 17:56:12 -06:00
|
|
|
// 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.
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* A simple map based on a vector for small integer keys. Space requirements
|
|
|
|
* are O(highest integer key).
|
|
|
|
*/
|
|
|
|
|
2014-03-21 20:05:05 -05:00
|
|
|
#![allow(missing_doc)]
|
2013-05-31 17:17:22 -05:00
|
|
|
|
2014-05-22 12:40:07 -05:00
|
|
|
use std::iter::{Enumerate, FilterMap};
|
2014-01-31 14:35:36 -06:00
|
|
|
use std::mem::replace;
|
2014-04-05 00:45:42 -05:00
|
|
|
use std::{vec, slice};
|
2013-01-31 17:56:12 -06:00
|
|
|
|
2013-05-28 22:11:41 -05:00
|
|
|
#[allow(missing_doc)]
|
2013-01-31 18:07:08 -06:00
|
|
|
pub struct SmallIntMap<T> {
|
2014-04-05 00:45:42 -05:00
|
|
|
v: Vec<Option<T>>,
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
2013-02-14 13:47:00 -06:00
|
|
|
impl<V> Container for SmallIntMap<V> {
|
2013-01-31 17:56:12 -06:00
|
|
|
/// Return the number of elements in the map
|
2013-06-15 01:20:06 -05:00
|
|
|
fn len(&self) -> uint {
|
2013-08-07 09:58:56 -05:00
|
|
|
self.v.iter().count(|elt| elt.is_some())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Return true if there are no elements in the map
|
|
|
|
fn is_empty(&self) -> bool {
|
|
|
|
self.v.iter().all(|elt| elt.is_none())
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-14 13:47:00 -06:00
|
|
|
impl<V> Mutable for SmallIntMap<V> {
|
2013-01-31 18:07:08 -06:00
|
|
|
/// Clear the map, removing all key-value pairs.
|
|
|
|
fn clear(&mut self) { self.v.clear() }
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
2013-02-14 13:47:00 -06:00
|
|
|
impl<V> Map<uint, V> for SmallIntMap<V> {
|
2013-03-24 19:35:23 -05:00
|
|
|
/// Return a reference to the value corresponding to the key
|
2013-04-10 15:14:06 -05:00
|
|
|
fn find<'a>(&'a self, key: &uint) -> Option<&'a V> {
|
|
|
|
if *key < self.v.len() {
|
2014-04-05 00:45:42 -05:00
|
|
|
match *self.v.get(*key) {
|
2013-04-10 15:14:06 -05:00
|
|
|
Some(ref value) => Some(value),
|
|
|
|
None => None
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
2013-07-13 21:44:36 -05:00
|
|
|
}
|
2013-04-10 15:14:06 -05:00
|
|
|
|
2013-07-13 21:44:36 -05:00
|
|
|
impl<V> MutableMap<uint, V> for SmallIntMap<V> {
|
2013-03-24 19:40:17 -05:00
|
|
|
/// Return a mutable reference to the value corresponding to the key
|
2013-04-10 15:14:06 -05:00
|
|
|
fn find_mut<'a>(&'a mut self, key: &uint) -> Option<&'a mut V> {
|
|
|
|
if *key < self.v.len() {
|
2014-04-05 00:45:42 -05:00
|
|
|
match *self.v.get_mut(*key) {
|
2013-04-10 15:14:06 -05:00
|
|
|
Some(ref mut value) => Some(value),
|
|
|
|
None => None
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-31 18:07:08 -06:00
|
|
|
/// Insert a key-value pair into the map. An existing value for a
|
|
|
|
/// key is replaced by the new value. Return true if the key did
|
|
|
|
/// not already exist in the map.
|
|
|
|
fn insert(&mut self, key: uint, value: V) -> bool {
|
|
|
|
let exists = self.contains_key(&key);
|
|
|
|
let len = self.v.len();
|
|
|
|
if len <= key {
|
2013-06-28 23:02:20 -05:00
|
|
|
self.v.grow_fn(key - len + 1, |_| None);
|
2013-01-31 18:07:08 -06:00
|
|
|
}
|
2014-04-05 00:45:42 -05:00
|
|
|
*self.v.get_mut(key) = Some(value);
|
2013-01-31 18:07:08 -06:00
|
|
|
!exists
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
2013-01-31 18:07:08 -06:00
|
|
|
/// Remove a key-value pair from the map. Return true if the key
|
|
|
|
/// was present in the map, otherwise false.
|
|
|
|
fn remove(&mut self, key: &uint) -> bool {
|
2013-05-04 08:54:58 -05:00
|
|
|
self.pop(key).is_some()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Insert a key-value pair from the map. If the key already had a value
|
|
|
|
/// present in the map, that value is returned. Otherwise None is returned.
|
|
|
|
fn swap(&mut self, key: uint, value: V) -> Option<V> {
|
|
|
|
match self.find_mut(&key) {
|
|
|
|
Some(loc) => { return Some(replace(loc, value)); }
|
|
|
|
None => ()
|
|
|
|
}
|
|
|
|
self.insert(key, value);
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Removes a key from the map, returning the value at the key if the key
|
|
|
|
/// was previously in the map.
|
|
|
|
fn pop(&mut self, key: &uint) -> Option<V> {
|
2013-01-31 18:07:08 -06:00
|
|
|
if *key >= self.v.len() {
|
2013-05-04 08:54:58 -05:00
|
|
|
return None;
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
2014-04-05 00:45:42 -05:00
|
|
|
self.v.get_mut(*key).take()
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
2013-01-31 18:07:08 -06:00
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
impl<V> SmallIntMap<V> {
|
2013-01-31 18:07:08 -06:00
|
|
|
/// Create an empty SmallIntMap
|
2014-04-05 00:45:42 -05:00
|
|
|
pub fn new() -> SmallIntMap<V> { SmallIntMap{v: vec!()} }
|
2013-01-31 18:07:08 -06:00
|
|
|
|
2014-04-03 22:47:53 -05:00
|
|
|
/// Create an empty SmallIntMap with capacity `capacity`
|
|
|
|
pub fn with_capacity(capacity: uint) -> SmallIntMap<V> {
|
2014-04-05 00:45:42 -05:00
|
|
|
SmallIntMap { v: Vec::with_capacity(capacity) }
|
2014-04-03 22:47:53 -05:00
|
|
|
}
|
|
|
|
|
2013-05-31 17:17:22 -05:00
|
|
|
pub fn get<'a>(&'a self, key: &uint) -> &'a V {
|
2013-04-10 15:14:06 -05:00
|
|
|
self.find(key).expect("key not present")
|
|
|
|
}
|
2013-07-04 18:18:44 -05:00
|
|
|
|
|
|
|
/// An iterator visiting all key-value pairs in ascending order by the keys.
|
|
|
|
/// Iterator element type is (uint, &'r V)
|
2014-01-14 21:32:24 -06:00
|
|
|
pub fn iter<'r>(&'r self) -> Entries<'r, V> {
|
|
|
|
Entries {
|
2013-07-19 19:29:54 -05:00
|
|
|
front: 0,
|
|
|
|
back: self.v.len(),
|
|
|
|
iter: self.v.iter()
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// An iterator visiting all key-value pairs in ascending order by the keys,
|
|
|
|
/// with mutable references to the values
|
|
|
|
/// Iterator element type is (uint, &'r mut V)
|
2014-01-14 21:32:24 -06:00
|
|
|
pub fn mut_iter<'r>(&'r mut self) -> MutEntries<'r, V> {
|
|
|
|
MutEntries {
|
2013-07-19 19:29:54 -05:00
|
|
|
front: 0,
|
|
|
|
back: self.v.len(),
|
|
|
|
iter: self.v.mut_iter()
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-08 23:16:23 -05:00
|
|
|
/// Empties the hash map, moving all values into the specified closure
|
2013-08-07 21:21:36 -05:00
|
|
|
pub fn move_iter(&mut self)
|
2013-07-27 16:41:20 -05:00
|
|
|
-> FilterMap<(uint, Option<V>), (uint, V),
|
2014-04-05 00:45:42 -05:00
|
|
|
Enumerate<vec::MoveItems<Option<V>>>>
|
2013-07-08 23:16:23 -05:00
|
|
|
{
|
2014-04-05 00:45:42 -05:00
|
|
|
let values = replace(&mut self.v, vec!());
|
2013-08-07 21:21:36 -05:00
|
|
|
values.move_iter().enumerate().filter_map(|(i, v)| {
|
2013-09-20 01:08:47 -05:00
|
|
|
v.map(|v| (i, v))
|
2013-07-08 23:16:23 -05:00
|
|
|
})
|
|
|
|
}
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
2013-07-02 14:47:32 -05:00
|
|
|
impl<V:Clone> SmallIntMap<V> {
|
2013-11-18 23:54:13 -06:00
|
|
|
pub fn update_with_key(&mut self,
|
|
|
|
key: uint,
|
|
|
|
val: V,
|
|
|
|
ff: |uint, V, V| -> V)
|
|
|
|
-> bool {
|
2013-02-09 00:21:45 -06:00
|
|
|
let new_val = match self.find(&key) {
|
|
|
|
None => val,
|
2013-07-02 14:47:32 -05:00
|
|
|
Some(orig) => ff(key, (*orig).clone(), val)
|
2013-02-09 00:21:45 -06:00
|
|
|
};
|
|
|
|
self.insert(key, new_val)
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
2013-01-31 18:07:08 -06:00
|
|
|
|
2013-11-18 23:54:13 -06:00
|
|
|
pub fn update(&mut self, key: uint, newval: V, ff: |V, V| -> V) -> bool {
|
2013-01-31 18:07:08 -06:00
|
|
|
self.update_with_key(key, newval, |_k, v, v1| ff(v,v1))
|
|
|
|
}
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
2013-07-04 18:18:44 -05:00
|
|
|
|
|
|
|
macro_rules! iterator {
|
2013-07-19 19:29:54 -05:00
|
|
|
(impl $name:ident -> $elem:ty, $getter:ident) => {
|
2013-12-10 01:16:18 -06:00
|
|
|
impl<'a, T> Iterator<$elem> for $name<'a, T> {
|
2013-07-04 18:18:44 -05:00
|
|
|
#[inline]
|
2013-07-19 19:29:54 -05:00
|
|
|
fn next(&mut self) -> Option<$elem> {
|
|
|
|
while self.front < self.back {
|
|
|
|
match self.iter.next() {
|
|
|
|
Some(elem) => {
|
|
|
|
if elem.is_some() {
|
|
|
|
let index = self.front;
|
|
|
|
self.front += 1;
|
|
|
|
return Some((index, elem. $getter ()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => ()
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
2013-07-19 19:29:54 -05:00
|
|
|
self.front += 1;
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
2013-07-19 19:29:54 -05:00
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn size_hint(&self) -> (uint, Option<uint>) {
|
|
|
|
(0, Some(self.back - self.front))
|
|
|
|
}
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
macro_rules! double_ended_iterator {
|
|
|
|
(impl $name:ident -> $elem:ty, $getter:ident) => {
|
2013-12-10 01:16:18 -06:00
|
|
|
impl<'a, T> DoubleEndedIterator<$elem> for $name<'a, T> {
|
2013-07-04 18:18:44 -05:00
|
|
|
#[inline]
|
2013-07-19 19:29:54 -05:00
|
|
|
fn next_back(&mut self) -> Option<$elem> {
|
|
|
|
while self.front < self.back {
|
|
|
|
match self.iter.next_back() {
|
|
|
|
Some(elem) => {
|
|
|
|
if elem.is_some() {
|
|
|
|
self.back -= 1;
|
|
|
|
return Some((self.back, elem. $getter ()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => ()
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
2013-07-19 19:29:54 -05:00
|
|
|
self.back -= 1;
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-14 21:32:24 -06:00
|
|
|
pub struct Entries<'a, T> {
|
2014-03-27 17:10:04 -05:00
|
|
|
front: uint,
|
|
|
|
back: uint,
|
|
|
|
iter: slice::Items<'a, Option<T>>
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
|
2014-01-14 21:32:24 -06:00
|
|
|
iterator!(impl Entries -> (uint, &'a T), get_ref)
|
|
|
|
double_ended_iterator!(impl Entries -> (uint, &'a T), get_ref)
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2014-01-14 21:32:24 -06:00
|
|
|
pub struct MutEntries<'a, T> {
|
2014-03-27 17:10:04 -05:00
|
|
|
front: uint,
|
|
|
|
back: uint,
|
|
|
|
iter: slice::MutItems<'a, Option<T>>
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
|
2014-01-14 21:32:24 -06:00
|
|
|
iterator!(impl MutEntries -> (uint, &'a mut T), get_mut_ref)
|
|
|
|
double_ended_iterator!(impl MutEntries -> (uint, &'a mut T), get_mut_ref)
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-01-31 17:56:12 -06:00
|
|
|
#[cfg(test)]
|
2013-07-19 19:29:54 -05:00
|
|
|
mod test_map {
|
2013-05-21 19:24:31 -05:00
|
|
|
|
2013-01-31 18:07:08 -06:00
|
|
|
use super::SmallIntMap;
|
2013-03-24 19:35:23 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_find_mut() {
|
|
|
|
let mut m = SmallIntMap::new();
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(m.insert(1, 12));
|
|
|
|
assert!(m.insert(2, 8));
|
|
|
|
assert!(m.insert(5, 14));
|
2013-03-24 19:35:23 -05:00
|
|
|
let new = 100;
|
|
|
|
match m.find_mut(&5) {
|
2013-10-21 15:08:31 -05:00
|
|
|
None => fail!(), Some(x) => *x = new
|
2013-03-24 19:35:23 -05:00
|
|
|
}
|
|
|
|
assert_eq!(m.find(&5), Some(&new));
|
|
|
|
}
|
2013-01-31 17:56:12 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_len() {
|
2013-01-31 18:07:08 -06:00
|
|
|
let mut map = SmallIntMap::new();
|
2013-05-18 21:02:45 -05:00
|
|
|
assert_eq!(map.len(), 0);
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(map.is_empty());
|
|
|
|
assert!(map.insert(5, 20));
|
2013-05-18 21:02:45 -05:00
|
|
|
assert_eq!(map.len(), 1);
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(!map.is_empty());
|
|
|
|
assert!(map.insert(11, 12));
|
2013-05-18 21:02:45 -05:00
|
|
|
assert_eq!(map.len(), 2);
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(!map.is_empty());
|
|
|
|
assert!(map.insert(14, 22));
|
2013-05-18 21:02:45 -05:00
|
|
|
assert_eq!(map.len(), 3);
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(!map.is_empty());
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_clear() {
|
2013-01-31 18:07:08 -06:00
|
|
|
let mut map = SmallIntMap::new();
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(map.insert(5, 20));
|
|
|
|
assert!(map.insert(11, 12));
|
|
|
|
assert!(map.insert(14, 22));
|
2013-01-31 17:56:12 -06:00
|
|
|
map.clear();
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(map.is_empty());
|
|
|
|
assert!(map.find(&5).is_none());
|
|
|
|
assert!(map.find(&11).is_none());
|
|
|
|
assert!(map.find(&14).is_none());
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_insert_with_key() {
|
2013-01-31 18:07:08 -06:00
|
|
|
let mut map = SmallIntMap::new();
|
2013-01-31 17:56:12 -06:00
|
|
|
|
2014-03-06 01:35:12 -06:00
|
|
|
// given a new key, initialize it with this new count,
|
2013-01-31 17:56:12 -06:00
|
|
|
// given an existing key, add more to its count
|
2014-05-25 19:12:43 -05:00
|
|
|
fn add_more_to_count(_k: uint, v0: uint, v1: uint) -> uint {
|
2013-01-31 17:56:12 -06:00
|
|
|
v0 + v1
|
|
|
|
}
|
|
|
|
|
2014-05-25 19:12:43 -05:00
|
|
|
fn add_more_to_count_simple(v0: uint, v1: uint) -> uint {
|
2013-01-31 17:56:12 -06:00
|
|
|
v0 + v1
|
|
|
|
}
|
|
|
|
|
|
|
|
// count integers
|
2014-05-25 19:12:43 -05:00
|
|
|
map.update(3, 1, add_more_to_count_simple);
|
|
|
|
map.update_with_key(9, 1, add_more_to_count);
|
|
|
|
map.update(3, 7, add_more_to_count_simple);
|
|
|
|
map.update_with_key(5, 3, add_more_to_count);
|
|
|
|
map.update_with_key(3, 2, add_more_to_count);
|
2013-01-31 17:56:12 -06:00
|
|
|
|
|
|
|
// check the total counts
|
2013-08-03 18:59:24 -05:00
|
|
|
assert_eq!(map.find(&3).unwrap(), &10);
|
|
|
|
assert_eq!(map.find(&5).unwrap(), &3);
|
|
|
|
assert_eq!(map.find(&9).unwrap(), &1);
|
2013-01-31 17:56:12 -06:00
|
|
|
|
|
|
|
// sadly, no sevens were counted
|
2013-03-28 20:39:09 -05:00
|
|
|
assert!(map.find(&7).is_none());
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
2013-05-04 08:54:58 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_swap() {
|
|
|
|
let mut m = SmallIntMap::new();
|
2013-05-18 21:02:45 -05:00
|
|
|
assert_eq!(m.swap(1, 2), None);
|
|
|
|
assert_eq!(m.swap(1, 3), Some(2));
|
|
|
|
assert_eq!(m.swap(1, 4), Some(3));
|
2013-05-04 08:54:58 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_pop() {
|
|
|
|
let mut m = SmallIntMap::new();
|
|
|
|
m.insert(1, 2);
|
2013-05-18 21:02:45 -05:00
|
|
|
assert_eq!(m.pop(&1), Some(2));
|
|
|
|
assert_eq!(m.pop(&1), None);
|
2013-05-04 08:54:58 -05:00
|
|
|
}
|
2013-07-04 18:18:44 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_iterator() {
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut m = SmallIntMap::new();
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
assert!(m.insert(0, 1));
|
|
|
|
assert!(m.insert(1, 2));
|
|
|
|
assert!(m.insert(3, 5));
|
|
|
|
assert!(m.insert(6, 10));
|
|
|
|
assert!(m.insert(10, 11));
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut it = m.iter();
|
|
|
|
assert_eq!(it.size_hint(), (0, Some(11)));
|
2013-07-04 18:18:44 -05:00
|
|
|
assert_eq!(it.next().unwrap(), (0, &1));
|
2013-07-19 19:29:54 -05:00
|
|
|
assert_eq!(it.size_hint(), (0, Some(10)));
|
2013-07-04 18:18:44 -05:00
|
|
|
assert_eq!(it.next().unwrap(), (1, &2));
|
2013-07-19 19:29:54 -05:00
|
|
|
assert_eq!(it.size_hint(), (0, Some(9)));
|
|
|
|
assert_eq!(it.next().unwrap(), (3, &5));
|
|
|
|
assert_eq!(it.size_hint(), (0, Some(7)));
|
|
|
|
assert_eq!(it.next().unwrap(), (6, &10));
|
|
|
|
assert_eq!(it.size_hint(), (0, Some(4)));
|
|
|
|
assert_eq!(it.next().unwrap(), (10, &11));
|
|
|
|
assert_eq!(it.size_hint(), (0, Some(0)));
|
2013-07-04 18:18:44 -05:00
|
|
|
assert!(it.next().is_none());
|
|
|
|
}
|
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
#[test]
|
|
|
|
fn test_iterator_size_hints() {
|
|
|
|
let mut m = SmallIntMap::new();
|
|
|
|
|
|
|
|
assert!(m.insert(0, 1));
|
|
|
|
assert!(m.insert(1, 2));
|
|
|
|
assert!(m.insert(3, 5));
|
|
|
|
assert!(m.insert(6, 10));
|
|
|
|
assert!(m.insert(10, 11));
|
|
|
|
|
|
|
|
assert_eq!(m.iter().size_hint(), (0, Some(11)));
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
assert_eq!(m.iter().rev().size_hint(), (0, Some(11)));
|
2013-07-19 19:29:54 -05:00
|
|
|
assert_eq!(m.mut_iter().size_hint(), (0, Some(11)));
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
assert_eq!(m.mut_iter().rev().size_hint(), (0, Some(11)));
|
2013-07-19 19:29:54 -05:00
|
|
|
}
|
|
|
|
|
2013-07-04 18:18:44 -05:00
|
|
|
#[test]
|
|
|
|
fn test_mut_iterator() {
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut m = SmallIntMap::new();
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
assert!(m.insert(0, 1));
|
|
|
|
assert!(m.insert(1, 2));
|
|
|
|
assert!(m.insert(3, 5));
|
|
|
|
assert!(m.insert(6, 10));
|
|
|
|
assert!(m.insert(10, 11));
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-08-03 11:45:23 -05:00
|
|
|
for (k, v) in m.mut_iter() {
|
2013-07-19 19:29:54 -05:00
|
|
|
*v += k as int;
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut it = m.iter();
|
|
|
|
assert_eq!(it.next().unwrap(), (0, &1));
|
|
|
|
assert_eq!(it.next().unwrap(), (1, &3));
|
|
|
|
assert_eq!(it.next().unwrap(), (3, &8));
|
|
|
|
assert_eq!(it.next().unwrap(), (6, &16));
|
|
|
|
assert_eq!(it.next().unwrap(), (10, &21));
|
|
|
|
assert!(it.next().is_none());
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_rev_iterator() {
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut m = SmallIntMap::new();
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
assert!(m.insert(0, 1));
|
|
|
|
assert!(m.insert(1, 2));
|
|
|
|
assert!(m.insert(3, 5));
|
|
|
|
assert!(m.insert(6, 10));
|
|
|
|
assert!(m.insert(10, 11));
|
2013-07-04 18:18:44 -05:00
|
|
|
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
let mut it = m.iter().rev();
|
2013-07-19 19:29:54 -05:00
|
|
|
assert_eq!(it.next().unwrap(), (10, &11));
|
|
|
|
assert_eq!(it.next().unwrap(), (6, &10));
|
|
|
|
assert_eq!(it.next().unwrap(), (3, &5));
|
|
|
|
assert_eq!(it.next().unwrap(), (1, &2));
|
|
|
|
assert_eq!(it.next().unwrap(), (0, &1));
|
|
|
|
assert!(it.next().is_none());
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_mut_rev_iterator() {
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut m = SmallIntMap::new();
|
2013-07-04 18:18:44 -05:00
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
assert!(m.insert(0, 1));
|
|
|
|
assert!(m.insert(1, 2));
|
|
|
|
assert!(m.insert(3, 5));
|
|
|
|
assert!(m.insert(6, 10));
|
|
|
|
assert!(m.insert(10, 11));
|
2013-07-04 18:18:44 -05:00
|
|
|
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
for (k, v) in m.mut_iter().rev() {
|
2013-07-19 19:29:54 -05:00
|
|
|
*v += k as int;
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
|
|
|
|
2013-07-19 19:29:54 -05:00
|
|
|
let mut it = m.iter();
|
|
|
|
assert_eq!(it.next().unwrap(), (0, &1));
|
|
|
|
assert_eq!(it.next().unwrap(), (1, &3));
|
|
|
|
assert_eq!(it.next().unwrap(), (3, &8));
|
|
|
|
assert_eq!(it.next().unwrap(), (6, &16));
|
|
|
|
assert_eq!(it.next().unwrap(), (10, &21));
|
|
|
|
assert!(it.next().is_none());
|
2013-07-04 18:18:44 -05:00
|
|
|
}
|
2013-07-08 23:16:23 -05:00
|
|
|
|
|
|
|
#[test]
|
2013-08-07 21:21:36 -05:00
|
|
|
fn test_move_iter() {
|
2013-07-08 23:16:23 -05:00
|
|
|
let mut m = SmallIntMap::new();
|
2014-04-25 03:08:02 -05:00
|
|
|
m.insert(1, box 2);
|
2013-07-08 23:16:23 -05:00
|
|
|
let mut called = false;
|
2013-08-07 21:21:36 -05:00
|
|
|
for (k, v) in m.move_iter() {
|
2013-07-08 23:16:23 -05:00
|
|
|
assert!(!called);
|
|
|
|
called = true;
|
|
|
|
assert_eq!(k, 1);
|
2014-05-05 20:56:44 -05:00
|
|
|
assert_eq!(v, box 2);
|
2013-07-08 23:16:23 -05:00
|
|
|
}
|
|
|
|
assert!(called);
|
2014-04-25 03:08:02 -05:00
|
|
|
m.insert(2, box 1);
|
2013-07-08 23:16:23 -05:00
|
|
|
}
|
2013-01-31 17:56:12 -06:00
|
|
|
}
|
2013-05-22 07:01:21 -05:00
|
|
|
|
2013-07-19 16:07:00 -05:00
|
|
|
#[cfg(test)]
|
|
|
|
mod bench {
|
2014-02-13 19:49:11 -06:00
|
|
|
extern crate test;
|
2014-03-31 20:16:35 -05:00
|
|
|
use self::test::Bencher;
|
2014-02-02 23:56:49 -06:00
|
|
|
use super::SmallIntMap;
|
|
|
|
use deque::bench::{insert_rand_n, insert_seq_n, find_rand_n, find_seq_n};
|
2013-07-19 16:07:00 -05:00
|
|
|
|
|
|
|
// Find seq
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn insert_rand_100(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
insert_rand_n(100, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn insert_rand_10_000(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
insert_rand_n(10_000, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Insert seq
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn insert_seq_100(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
insert_seq_n(100, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn insert_seq_10_000(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
insert_seq_n(10_000, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Find rand
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn find_rand_100(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
find_rand_n(100, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn find_rand_10_000(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
find_rand_n(10_000, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Find seq
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn find_seq_100(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
find_seq_n(100, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[bench]
|
2014-03-31 20:16:35 -05:00
|
|
|
pub fn find_seq_10_000(b: &mut Bencher) {
|
2013-07-19 16:07:00 -05:00
|
|
|
let mut m : SmallIntMap<uint> = SmallIntMap::new();
|
2014-03-31 20:16:35 -05:00
|
|
|
find_seq_n(10_000, &mut m, b);
|
2013-07-19 16:07:00 -05:00
|
|
|
}
|
|
|
|
}
|