Remove the now-unit-struct AllocErr parameter of oom()

This commit is contained in:
Simon Sapin
2018-04-03 16:00:04 +02:00
parent 86753ce1cc
commit 157ff8cd05
12 changed files with 28 additions and 28 deletions

View File

@@ -784,7 +784,7 @@ impl<K, V, S> HashMap<K, V, S>
pub fn reserve(&mut self, additional: usize) {
match self.try_reserve(additional) {
Err(CollectionAllocErr::CapacityOverflow) => panic!("capacity overflow"),
Err(CollectionAllocErr::AllocErr(e)) => Global.oom(e),
Err(CollectionAllocErr::AllocErr(_)) => Global.oom(),
Ok(()) => { /* yay */ }
}
}

View File

@@ -772,7 +772,7 @@ impl<K, V> RawTable<K, V> {
unsafe fn new_uninitialized(capacity: usize) -> RawTable<K, V> {
match Self::try_new_uninitialized(capacity) {
Err(CollectionAllocErr::CapacityOverflow) => panic!("capacity overflow"),
Err(CollectionAllocErr::AllocErr(e)) => Global.oom(e),
Err(CollectionAllocErr::AllocErr(_)) => Global.oom(),
Ok(table) => { table }
}
}
@@ -811,7 +811,7 @@ impl<K, V> RawTable<K, V> {
pub fn new(capacity: usize) -> RawTable<K, V> {
match Self::try_new(capacity) {
Err(CollectionAllocErr::CapacityOverflow) => panic!("capacity overflow"),
Err(CollectionAllocErr::AllocErr(e)) => Global.oom(e),
Err(CollectionAllocErr::AllocErr(_)) => Global.oom(),
Ok(table) => { table }
}
}