style: Remove servo/components/{hashglobe,fallible} in favor of try_reserve

Differential Revision: https://phabricator.services.mozilla.com/D134194
This commit is contained in:
Emilio Cobos Álvarez 2023-06-06 18:07:21 +02:00 committed by Oriol Brufau
parent 07d1bd560b
commit 2b6fce1e57
33 changed files with 157 additions and 7113 deletions

View file

@ -10,9 +10,8 @@ use crate::selector_map::{
MaybeCaseInsensitiveHashMap, PrecomputedHashMap, SelectorMap, SelectorMapEntry,
};
use crate::selector_parser::SelectorImpl;
use crate::AllocErr;
use crate::{Atom, LocalName, Namespace};
use fallible::FallibleVec;
use hashglobe::FailedAllocationError;
use selectors::attr::NamespaceConstraint;
use selectors::parser::{Combinator, Component};
use selectors::parser::{Selector, SelectorIter};
@ -244,7 +243,7 @@ impl InvalidationMap {
&mut self,
selector: &Selector<SelectorImpl>,
quirks_mode: QuirksMode,
) -> Result<(), FailedAllocationError> {
) -> Result<(), AllocErr> {
debug!("InvalidationMap::note_selector({:?})", selector);
let mut document_state = DocumentState::empty();
@ -274,7 +273,8 @@ impl InvalidationMap {
state: document_state,
dependency: Dependency::for_full_selector_invalidation(selector.clone()),
};
self.document_state_selectors.try_push(dep)?;
self.document_state_selectors.try_reserve(1)?;
self.document_state_selectors.push(dep);
}
Ok(())
@ -325,7 +325,7 @@ struct SelectorDependencyCollector<'a> {
compound_state: PerCompoundState,
/// The allocation error, if we OOM.
alloc_error: &'a mut Option<FailedAllocationError>,
alloc_error: &'a mut Option<AllocErr>,
}
impl<'a> SelectorDependencyCollector<'a> {
@ -361,7 +361,7 @@ impl<'a> SelectorDependencyCollector<'a> {
self.quirks_mode,
);
if let Err(alloc_error) = result {
*self.alloc_error = Some(alloc_error);
*self.alloc_error = Some(alloc_error.into());
return false;
}
}
@ -378,21 +378,17 @@ impl<'a> SelectorDependencyCollector<'a> {
let dependency = self.dependency();
let map = &mut self.map.other_attribute_affecting_selectors;
let entry = match map.try_entry(name) {
Ok(entry) => entry,
Err(err) => {
*self.alloc_error = Some(err);
return false;
},
};
match entry.or_insert_with(SmallVec::new).try_push(dependency) {
Ok(..) => true,
Err(err) => {
*self.alloc_error = Some(err);
return false;
},
if let Err(err) = map.try_reserve(1) {
*self.alloc_error = Some(err.into());
return false;
}
let vec = map.entry(name).or_default();
if let Err(err) = vec.try_reserve(1) {
*self.alloc_error = Some(err.into());
return false;
}
vec.push(dependency);
true
}
fn dependency(&self) -> Dependency {
@ -481,17 +477,17 @@ impl<'a> SelectorVisitor for SelectorDependencyCollector<'a> {
let entry = match map.try_entry(atom.0.clone(), self.quirks_mode) {
Ok(entry) => entry,
Err(err) => {
*self.alloc_error = Some(err);
*self.alloc_error = Some(err.into());
return false;
},
};
match entry.or_insert_with(SmallVec::new).try_push(dependency) {
Ok(..) => true,
Err(err) => {
*self.alloc_error = Some(err);
return false;
},
let vec = entry.or_insert_with(SmallVec::new);
if let Err(err) = vec.try_reserve(1) {
*self.alloc_error = Some(err.into());
return false;
}
vec.push(dependency);
true
},
Component::NonTSPseudoClass(ref pc) => {
self.compound_state.element_state |= pc.state_flag();