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

Remove some deprecated into_owned calls.

Browse source
This commit is contained in:
Ms2ger 2014-07-04 11:57:08 +02:00
parent 11aa36619d
commit 2aad6539e4
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/style/selectors.rs
View file

@ -306,13 +306,13 @@ fn parse_one_simple_selector(iter: &mut Iter, namespaces: &NamespaceMap, inside_
-> SimpleSelectorParseResult { -> SimpleSelectorParseResult {
match iter.peek() { match iter.peek() {
Some(&IDHash(_)) => match iter.next() { Some(&IDHash(_)) => match iter.next() {
Some(IDHash(id)) => SimpleSelectorResult(IDSelector(id.into_owned())), Some(IDHash(id)) => SimpleSelectorResult(IDSelector(id)),
_ => fail!("Implementation error, this should not happen."), _ => fail!("Implementation error, this should not happen."),
}, },
Some(&Delim('.')) => { Some(&Delim('.')) => {
iter.next(); iter.next();
match iter.next() { match iter.next() {
Some(Ident(class)) => SimpleSelectorResult(ClassSelector(class.into_owned())), Some(Ident(class)) => SimpleSelectorResult(ClassSelector(class)),
_ => InvalidSimpleSelector, _ => InvalidSimpleSelector,
} }
} }
@ -455,16 +455,16 @@ fn parse_attribute_selector(content: Vec<ComponentValue>, namespaces: &Namespace
}};) }};)
let result = match iter.next() { let result = match iter.next() {
None => AttrExists(attr), // [foo] None => AttrExists(attr), // [foo]
Some(Delim('=')) => AttrEqual(attr, (get_value!()).into_owned()), // [foo=bar] Some(Delim('=')) => AttrEqual(attr, (get_value!())), // [foo=bar]
Some(IncludeMatch) => AttrIncludes(attr, (get_value!()).into_owned()), // [foo~=bar] Some(IncludeMatch) => AttrIncludes(attr, (get_value!())), // [foo~=bar]
Some(DashMatch) => { Some(DashMatch) => {
let value = get_value!(); let value = get_value!();
let dashing_value = format!("{}-", value); let dashing_value = format!("{}-", value);
AttrDashMatch(attr, value.into_owned(), dashing_value) // [foo|=bar] AttrDashMatch(attr, value, dashing_value) // [foo|=bar]
}, },
Some(PrefixMatch) => AttrPrefixMatch(attr, (get_value!()).into_owned()), // [foo^=bar] Some(PrefixMatch) => AttrPrefixMatch(attr, (get_value!())), // [foo^=bar]
Some(SubstringMatch) => AttrSubstringMatch(attr, (get_value!()).into_owned()), // [foo*=bar] Some(SubstringMatch) => AttrSubstringMatch(attr, (get_value!())), // [foo*=bar]
Some(SuffixMatch) => AttrSuffixMatch(attr, (get_value!()).into_owned()), // [foo$=bar] Some(SuffixMatch) => AttrSuffixMatch(attr, (get_value!())), // [foo$=bar]
_ => return None _ => return None
}; };
skip_whitespace(iter); skip_whitespace(iter);
@ -551,7 +551,7 @@ fn parse_negation(arguments: Vec<ComponentValue>, namespaces: &NamespaceMap)
#[inline] #[inline]
fn get_next_ident(iter: &mut Iter) -> String { fn get_next_ident(iter: &mut Iter) -> String {
match iter.next() { match iter.next() {
Some(Ident(value)) => value.into_owned(), Some(Ident(value)) => value,
_ => fail!("Implementation error, this should not happen."), _ => fail!("Implementation error, this should not happen."),
} }
} }