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

style: Simplify some attr() parsing code.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-06-02 12:51:33 +02:00
parent d6e703a9e9
commit 26ef0f6178
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

39
components/style/values/specified/mod.rs
View file

@ -1425,27 +1425,28 @@ impl Attr {
let first = input.try(|i| i.expect_ident()).ok(); let first = input.try(|i| i.expect_ident()).ok();
if let Ok(token) = input.try(|i| i.next_including_whitespace()) { if let Ok(token) = input.try(|i| i.next_including_whitespace()) {
match token { match token {
Token::Delim('|') => { Token::Delim('|') => {}
// must be followed by an ident _ => return Err(()),
let second_token = match input.next_including_whitespace()? {
Token::Ident(second) => second,
_ => return Err(()),
};
let ns_with_id = if let Some(ns) = first {
let ns: Namespace = ns.into();
let id = get_id_for_namespace(&ns, context)?;
Some((ns, id))
} else {
None
};
return Ok(Attr {
namespace: ns_with_id,
attribute: second_token.into_owned(),
})
}
_ => return Err(())
} }
// must be followed by an ident
let second_token = match input.next_including_whitespace()? {
Token::Ident(second) => second,
_ => return Err(()),
};
let ns_with_id = if let Some(ns) = first {
let ns: Namespace = ns.into();
let id = get_id_for_namespace(&ns, context)?;
Some((ns, id))
} else {
None
};
return Ok(Attr {
namespace: ns_with_id,
attribute: second_token.into_owned(),
})
} }
if let Some(first) = first { if let Some(first) = first {
Ok(Attr { Ok(Attr {
namespace: None, namespace: None,