Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Diagnostic map semantics."

Browse source 
This reverts commit f5c5be00a7.
This commit is contained in:
Manish Goregaokar 2017-10-23 13:51:08 -07:00
parent d6bafde971
commit b118ba72d0
11 changed files with 70 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/style/custom_properties.rs
View file

@ -10,7 +10,7 @@ use Atom;
use cssparser::{Delimiter, Parser, ParserInput, SourcePosition, Token, TokenSerializationType};
use precomputed_hash::PrecomputedHash;
use properties::{CSSWideKeyword, DeclaredValue};
use selector_map::{PrecomputedHashSet, PrecomputedHashMap, PrecomputedDiagnosticHashMap};
use selector_map::{PrecomputedHashSet, PrecomputedHashMap};
use selectors::parser::SelectorParseErrorKind;
use servo_arc::Arc;
use smallvec::SmallVec;
@ -88,7 +88,7 @@ where
/// Key index.
index: Vec<K>,
/// Key-value map.
values: PrecomputedDiagnosticHashMap<K, V>,
values: PrecomputedHashMap<K, V>,
}
impl<K, V> OrderedMap<K, V>
@ -99,7 +99,7 @@ where
pub fn new() -> Self {
OrderedMap {
index: Vec::new(),
values: PrecomputedDiagnosticHashMap::default(),
values: PrecomputedHashMap::default(),
}
}
@ -108,9 +108,7 @@ where
if !self.values.contains_key(&key) {
self.index.push(key.clone());
}
self.values.begin_mutation();
self.values.try_insert(key, value).unwrap();
self.values.end_mutation();
self.values.insert(key, value);
}
/// Get a value given its key.
@ -160,10 +158,7 @@ where
None => return None,
};
self.index.remove(index);
self.values.begin_mutation();
let result = self.values.remove(key);
self.values.end_mutation();
result
self.values.remove(key)
}
fn remove_set<S>(&mut self, set: &::hash::HashSet<K, S>)
@ -211,7 +206,7 @@ where
};
self.pos += 1;
let value = &self.inner.values.get(key).unwrap();
let value = &self.inner.values[key];
Some((key, value))
}