1fa0be2bc0
This commit implements the stabilization of the custom hasher support intended for 1.7 but left out due to some last-minute questions that needed some decisions. A summary of the actions done in this PR are: Stable * `std:#️⃣:BuildHasher` * `BuildHasher::Hasher` * `BuildHasher::build_hasher` * `std:#️⃣:BuildHasherDefault` * `HashMap::with_hasher` * `HashMap::with_capacity_and_hasher` * `HashSet::with_hasher` * `HashSet::with_capacity_and_hasher` * `std::collections::hash_map::RandomState` * `RandomState::new` Deprecated * `std::collections::hash_state` * `std::collections::hash_state::HashState` - this trait was also moved into `std::hash` with a reexport here to ensure that we can have a blanket impl to prevent immediate breakage on nightly. Note that this is unstable in both location. * `HashMap::with_hash_state` - renamed * `HashMap::with_capacity_and_hash_state` - renamed * `HashSet::with_hash_state` - renamed * `HashSet::with_capacity_and_hash_state` - renamed Closes #27713
226 lines
6.5 KiB
Rust
226 lines
6.5 KiB
Rust
// 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.
|
|
|
|
//! Implementations of serialization for structures found in libcollections
|
|
|
|
use std::hash::{Hash, BuildHasher};
|
|
use std::mem;
|
|
|
|
use {Decodable, Encodable, Decoder, Encoder};
|
|
use std::collections::{LinkedList, VecDeque, BTreeMap, BTreeSet, HashMap, HashSet};
|
|
use collections::enum_set::{EnumSet, CLike};
|
|
|
|
impl<
|
|
T: Encodable
|
|
> Encodable for LinkedList<T> {
|
|
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
|
|
s.emit_seq(self.len(), |s| {
|
|
for (i, e) in self.iter().enumerate() {
|
|
try!(s.emit_seq_elt(i, |s| e.encode(s)));
|
|
}
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<T:Decodable> Decodable for LinkedList<T> {
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<LinkedList<T>, D::Error> {
|
|
d.read_seq(|d, len| {
|
|
let mut list = LinkedList::new();
|
|
for i in 0..len {
|
|
list.push_back(try!(d.read_seq_elt(i, |d| Decodable::decode(d))));
|
|
}
|
|
Ok(list)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<T: Encodable> Encodable for VecDeque<T> {
|
|
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
|
|
s.emit_seq(self.len(), |s| {
|
|
for (i, e) in self.iter().enumerate() {
|
|
try!(s.emit_seq_elt(i, |s| e.encode(s)));
|
|
}
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<T:Decodable> Decodable for VecDeque<T> {
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<VecDeque<T>, D::Error> {
|
|
d.read_seq(|d, len| {
|
|
let mut deque: VecDeque<T> = VecDeque::new();
|
|
for i in 0..len {
|
|
deque.push_back(try!(d.read_seq_elt(i, |d| Decodable::decode(d))));
|
|
}
|
|
Ok(deque)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<
|
|
K: Encodable + PartialEq + Ord,
|
|
V: Encodable + PartialEq
|
|
> Encodable for BTreeMap<K, V> {
|
|
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
|
|
e.emit_map(self.len(), |e| {
|
|
let mut i = 0;
|
|
for (key, val) in self {
|
|
try!(e.emit_map_elt_key(i, |e| key.encode(e)));
|
|
try!(e.emit_map_elt_val(i, |e| val.encode(e)));
|
|
i += 1;
|
|
}
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<
|
|
K: Decodable + PartialEq + Ord,
|
|
V: Decodable + PartialEq
|
|
> Decodable for BTreeMap<K, V> {
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<BTreeMap<K, V>, D::Error> {
|
|
d.read_map(|d, len| {
|
|
let mut map = BTreeMap::new();
|
|
for i in 0..len {
|
|
let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d)));
|
|
let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d)));
|
|
map.insert(key, val);
|
|
}
|
|
Ok(map)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<
|
|
T: Encodable + PartialEq + Ord
|
|
> Encodable for BTreeSet<T> {
|
|
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
|
|
s.emit_seq(self.len(), |s| {
|
|
let mut i = 0;
|
|
for e in self {
|
|
try!(s.emit_seq_elt(i, |s| e.encode(s)));
|
|
i += 1;
|
|
}
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<
|
|
T: Decodable + PartialEq + Ord
|
|
> Decodable for BTreeSet<T> {
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<BTreeSet<T>, D::Error> {
|
|
d.read_seq(|d, len| {
|
|
let mut set = BTreeSet::new();
|
|
for i in 0..len {
|
|
set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d))));
|
|
}
|
|
Ok(set)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<
|
|
T: Encodable + CLike
|
|
> Encodable for EnumSet<T> {
|
|
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
|
|
let mut bits = 0;
|
|
for item in self {
|
|
bits |= item.to_usize();
|
|
}
|
|
s.emit_uint(bits)
|
|
}
|
|
}
|
|
|
|
impl<
|
|
T: Decodable + CLike
|
|
> Decodable for EnumSet<T> {
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<EnumSet<T>, D::Error> {
|
|
let bits = try!(d.read_uint());
|
|
let mut set = EnumSet::new();
|
|
for bit in 0..(mem::size_of::<usize>()*8) {
|
|
if bits & (1 << bit) != 0 {
|
|
set.insert(CLike::from_usize(1 << bit));
|
|
}
|
|
}
|
|
Ok(set)
|
|
}
|
|
}
|
|
|
|
impl<K, V, S> Encodable for HashMap<K, V, S>
|
|
where K: Encodable + Hash + Eq,
|
|
V: Encodable,
|
|
S: BuildHasher,
|
|
{
|
|
fn encode<E: Encoder>(&self, e: &mut E) -> Result<(), E::Error> {
|
|
e.emit_map(self.len(), |e| {
|
|
let mut i = 0;
|
|
for (key, val) in self {
|
|
try!(e.emit_map_elt_key(i, |e| key.encode(e)));
|
|
try!(e.emit_map_elt_val(i, |e| val.encode(e)));
|
|
i += 1;
|
|
}
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<K, V, S> Decodable for HashMap<K, V, S>
|
|
where K: Decodable + Hash + Eq,
|
|
V: Decodable,
|
|
S: BuildHasher + Default,
|
|
{
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<HashMap<K, V, S>, D::Error> {
|
|
d.read_map(|d, len| {
|
|
let state = Default::default();
|
|
let mut map = HashMap::with_capacity_and_hasher(len, state);
|
|
for i in 0..len {
|
|
let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d)));
|
|
let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d)));
|
|
map.insert(key, val);
|
|
}
|
|
Ok(map)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<T, S> Encodable for HashSet<T, S>
|
|
where T: Encodable + Hash + Eq,
|
|
S: BuildHasher,
|
|
{
|
|
fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> {
|
|
s.emit_seq(self.len(), |s| {
|
|
let mut i = 0;
|
|
for e in self {
|
|
try!(s.emit_seq_elt(i, |s| e.encode(s)));
|
|
i += 1;
|
|
}
|
|
Ok(())
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<T, S> Decodable for HashSet<T, S>
|
|
where T: Decodable + Hash + Eq,
|
|
S: BuildHasher + Default,
|
|
{
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<HashSet<T, S>, D::Error> {
|
|
d.read_seq(|d, len| {
|
|
let state = Default::default();
|
|
let mut set = HashSet::with_capacity_and_hasher(len, state);
|
|
for i in 0..len {
|
|
set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d))));
|
|
}
|
|
Ok(set)
|
|
})
|
|
}
|
|
}
|