Replace RwLock<CssRules> with Locked<CssRules>

This commit is contained in:
Simon Sapin 2017-03-17 11:01:13 +01:00
parent b213daaa88
commit f35b4e27b3
15 changed files with 85 additions and 52 deletions

View file

@ -35,7 +35,7 @@ fn test_media_rule<F>(css: &str, callback: F)
ParserContextExtraData::default());
let mut rule_count = 0;
let guard = stylesheet.shared_lock.read();
media_queries(&guard, &stylesheet.rules.read().0, &mut |mq| {
media_queries(&guard, &stylesheet.rules.read_with(&guard).0, &mut |mq| {
rule_count += 1;
callback(mq, css);
});

View file

@ -49,7 +49,8 @@ fn parse_rules(css: &str) -> Vec<(StyleSource, CascadeLevel)> {
None,
&ErrorringErrorReporter,
ParserContextExtraData {});
let rules = s.rules.read();
let guard = s.shared_lock.read();
let rules = s.rules.read_with(&guard);
rules.0.iter().filter_map(|rule| {
match *rule {
CssRule::Style(ref style_rule) => Some(style_rule),

View file

@ -263,7 +263,7 @@ fn test_parse_stylesheet() {
]
})))
]),
], &stylesheet.shared_lock),
};
assert_eq!(format!("{:#?}", stylesheet), format!("{:#?}", expected));