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

Diagnostic map semantics.

Browse source 
MozReview-Commit-ID: C0a5g6xMPY0
This commit is contained in:
Bobby Holley 2017-09-28 19:10:46 -05:00
parent 438b9df00c
commit f5c5be00a7
11 changed files with 296 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/style/custom_properties.rs
View file

@ -11,7 +11,7 @@ use cssparser::{Delimiter, Parser, ParserInput, SourcePosition, Token, TokenSeri
use parser::ParserContext;
use precomputed_hash::PrecomputedHash;
use properties::{CSSWideKeyword, DeclaredValue};
use selector_map::{PrecomputedHashSet, PrecomputedHashMap};
use selector_map::{PrecomputedHashSet, PrecomputedDiagnosticHashMap};
use selectors::parser::SelectorParseError;
use servo_arc::Arc;
use std::ascii::AsciiExt;
@ -105,7 +105,7 @@ where
/// Key index.
index: Vec<K>,
/// Key-value map.
values: PrecomputedHashMap<K, V>,
values: PrecomputedDiagnosticHashMap<K, V>,
}
impl<K, V> OrderedMap<K, V>
@ -116,7 +116,7 @@ where
pub fn new() -> Self {
OrderedMap {
index: Vec::new(),
values: PrecomputedHashMap::default(),
values: PrecomputedDiagnosticHashMap::default(),
}
}
@ -125,7 +125,9 @@ where
if !self.values.contains_key(&key) {
self.index.push(key.clone());
}
self.values.insert(key, value);
self.values.begin_mutation();
self.values.try_insert(key, value).unwrap();
self.values.end_mutation();
}
/// Get a value given its key.
@ -165,7 +167,10 @@ where
None => return None,
};
self.index.remove(index);
self.values.remove(key)
self.values.begin_mutation();
let result = self.values.remove(key);
self.values.end_mutation();
result
}
}
@ -196,7 +201,7 @@ where
};
self.pos += 1;
let value = &self.inner.values[key];
let value = &self.inner.values.get(key).unwrap();
Some((key, value))
}