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

style: Avoid some clone()s in selector parsing now that lifetimes are non-lexical

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D123622
This commit is contained in:
Emilio Cobos Álvarez 2021-08-30 11:08:23 +00:00 • committed by Martin Robinson
parent 921987048c
commit 653245c94e
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/selectors/parser.rs
View file

@ -1878,9 +1878,9 @@ where
}; };
let start = input.state(); let start = input.state();
// FIXME: remove clone() when lifetimes are non-lexical match input.next_including_whitespace() {
match input.next_including_whitespace().map(|t| t.clone()) {
Ok(Token::Ident(value)) => { Ok(Token::Ident(value)) => {
let value = value.clone();
let after_ident = input.state(); let after_ident = input.state();
match input.next_including_whitespace() { match input.next_including_whitespace() {
Ok(&Token::Delim('|')) => { Ok(&Token::Delim('|')) => {
@ -1908,28 +1908,25 @@ where
}, },
Ok(Token::Delim('*')) => { Ok(Token::Delim('*')) => {
let after_star = input.state(); let after_star = input.state();
// FIXME: remove clone() when lifetimes are non-lexical match input.next_including_whitespace() {
match input.next_including_whitespace().map(|t| t.clone()) { Ok(&Token::Delim('|')) => {
Ok(Token::Delim('|')) => {
explicit_namespace(input, QNamePrefix::ExplicitAnyNamespace) explicit_namespace(input, QNamePrefix::ExplicitAnyNamespace)
}, },
result => { _ if !in_attr_selector => {
input.reset(&after_star); input.reset(&after_star);
if in_attr_selector { default_namespace(None)
match result { }
Ok(t) => Err(after_star result => {
.source_location() let t = result?;
.new_custom_error(SelectorParseErrorKind::ExpectedBarInAttr(t))), Err(after_star
Err(e) => Err(e.into()), .source_location()
} .new_custom_error(SelectorParseErrorKind::ExpectedBarInAttr(t.clone())))
} else {
default_namespace(None)
}
}, },
} }
}, },
Ok(Token::Delim('|')) => explicit_namespace(input, QNamePrefix::ExplicitNoNamespace), Ok(Token::Delim('|')) => explicit_namespace(input, QNamePrefix::ExplicitNoNamespace),
Ok(t) => { Ok(t) => {
let t = t.clone();
input.reset(&start); input.reset(&start);
Ok(OptionalQName::None(t)) Ok(OptionalQName::None(t))
}, },