mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Update string_cache to 0.2.
Updated string_cache, html5ever, xml5ever and selectors in Cargo.toml files and Cargo.lock. Removed references to string_cache_plugin. Import atom! and ns! from string_cache. Replaced ns!("") by ns!(). Replaced ns!(XML) and co by ns!(xml) and co. Replaced atom!(foo) by atom!("foo"). Replaced Atom::from_slice by Atom::from. Replaced atom.as_slice() by &*atom.
This commit is contained in:
parent
e7b1924948
commit
3dec6edd10
68 changed files with 328 additions and 434 deletions
|
@ -137,13 +137,13 @@ impl<'a, E> Element for ElementWrapper<'a, E> where E: Element {
|
|||
}
|
||||
fn get_id(&self) -> Option<Atom> {
|
||||
match self.snapshot.attrs {
|
||||
Some(_) => self.snapshot.get_attr(&ns!(""), &atom!("id")).map(|value| value.as_atom().clone()),
|
||||
Some(_) => self.snapshot.get_attr(&ns!(), &atom!("id")).map(|value| value.as_atom().clone()),
|
||||
None => self.element.get_id(),
|
||||
}
|
||||
}
|
||||
fn has_class(&self, name: &Atom) -> bool {
|
||||
match self.snapshot.attrs {
|
||||
Some(_) => self.snapshot.get_attr(&ns!(""), &atom!("class"))
|
||||
Some(_) => self.snapshot.get_attr(&ns!(), &atom!("class"))
|
||||
.map_or(false, |v| { v.as_tokens().iter().any(|atom| atom == name) }),
|
||||
None => self.element.has_class(name),
|
||||
}
|
||||
|
@ -180,7 +180,7 @@ impl<'a, E> Element for ElementWrapper<'a, E> where E: Element {
|
|||
fn each_class<F>(&self, mut callback: F) where F: FnMut(&Atom) {
|
||||
match self.snapshot.attrs {
|
||||
Some(_) => {
|
||||
if let Some(v) = self.snapshot.get_attr(&ns!(""), &atom!("class")) {
|
||||
if let Some(v) = self.snapshot.get_attr(&ns!(), &atom!("class")) {
|
||||
for c in v.as_tokens() { callback(c) }
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue