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

Remove some trailing whitespace.

Browse source
This commit is contained in:
Simon Sapin 2014-01-08 13:43:30 +00:00
parent 99157c6412
commit 7a9b917c4f
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/style/selector_matching.rs
View file

@ -120,7 +120,7 @@ impl SelectorMap {
N:TNode<E>>( N:TNode<E>>(
node: &N, node: &N,
pseudo_element: Option<PseudoElement>, pseudo_element: Option<PseudoElement>,
hash: &HashMap<~str,~[Rule]>, hash: &HashMap<~str,~[Rule]>,
key: &str, key: &str,
matching_rules: &mut ~[Rule]) { matching_rules: &mut ~[Rule]) {
match hash.find(&key.to_str()) { match hash.find(&key.to_str()) {
@ -130,7 +130,7 @@ impl SelectorMap {
None => {} None => {}
} }
} }
/// Adds rules in `rules` that match `node` to the `matching_rules` list. /// Adds rules in `rules` that match `node` to the `matching_rules` list.
fn get_matching_rules<E:TElement, fn get_matching_rules<E:TElement,
N:TNode<E>>( N:TNode<E>>(
@ -310,7 +310,7 @@ impl Stylist {
assert!(element.is_element()); assert!(element.is_element());
assert!(style_attribute.is_none() || self.pseudo_element.is_none(), assert!(style_attribute.is_none() || self.pseudo_element.is_none(),
"Style attributes do not apply to pseudo-elements"); "Style attributes do not apply to pseudo-elements");
// In cascading order: // In cascading order:
let rule_map_list = [ let rule_map_list = [
&self.ua_rule_map.normal, &self.ua_rule_map.normal,
@ -332,7 +332,7 @@ impl Stylist {
rule_map_indices[i] = matching_rules_list.len(); rule_map_indices[i] = matching_rules_list.len();
rule_map.get_all_matching_rules(element, self.pseudo_element, &mut matching_rules_list); rule_map.get_all_matching_rules(element, self.pseudo_element, &mut matching_rules_list);
} }
let count = matching_rules_list.len(); let count = matching_rules_list.len();
let mut declaration_iter = matching_rules_list.move_iter().map(|rule| { let mut declaration_iter = matching_rules_list.move_iter().map(|rule| {
@ -373,7 +373,7 @@ impl Stylist {
applicable_declarations applicable_declarations
} }
pub fn get_pseudo_element(&self) -> Option<PseudoElement> { pub fn get_pseudo_element(&self) -> Option<PseudoElement> {
self.pseudo_element self.pseudo_element
} }

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

@ -310,7 +310,7 @@ fn parse_one_simple_selector(iter: &mut Iter, namespaces: &NamespaceMap, inside_
Some(Ident(name)) => match parse_simple_pseudo_class(name) { Some(Ident(name)) => match parse_simple_pseudo_class(name) {
None => { None => {
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683 // FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
let name_lower = name.to_ascii_lower(); let name_lower = name.to_ascii_lower();
match name_lower.as_slice() { match name_lower.as_slice() {
// Supported CSS 2.1 pseudo-elements only. // Supported CSS 2.1 pseudo-elements only.
// ** Do not add to this list! ** // ** Do not add to this list! **
@ -470,7 +470,7 @@ fn parse_functional_pseudo_class(name: ~str, arguments: ~[ComponentValue],
namespaces: &NamespaceMap, inside_negation: bool) namespaces: &NamespaceMap, inside_negation: bool)
-> Option<SimpleSelector> { -> Option<SimpleSelector> {
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683 // FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
let name_lower = name.to_ascii_lower(); let name_lower = name.to_ascii_lower();
match name_lower.as_slice() { match name_lower.as_slice() {
// "lang" => parse_lang(arguments), // "lang" => parse_lang(arguments),
"nth-child" => parse_nth(arguments).map(|(a, b)| NthChild(a, b)), "nth-child" => parse_nth(arguments).map(|(a, b)| NthChild(a, b)),
@ -485,7 +485,7 @@ fn parse_functional_pseudo_class(name: ~str, arguments: ~[ComponentValue],
fn parse_pseudo_element(name: ~str) -> Option<PseudoElement> { fn parse_pseudo_element(name: ~str) -> Option<PseudoElement> {
// FIXME: Workaround for https://github.com/mozilla/rust/issues/10683 // FIXME: Workaround for https://github.com/mozilla/rust/issues/10683
let name_lower = name.to_ascii_lower(); let name_lower = name.to_ascii_lower();
match name_lower.as_slice() { match name_lower.as_slice() {
// All supported pseudo-elements // All supported pseudo-elements
"before" => Some(Before), "before" => Some(Before),