aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/legacy.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-03-11 11:08:57 +0100
committerJosh Matthews <josh@joshmatthews.net>2015-03-18 13:18:31 -0400
commit5f15eb5fbfb7a8649132cc8b3a07314389836714 (patch)
treecc36210329cb1a31709a03685c05c4aaa99407e3 /components/style/legacy.rs
parent65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff)
downloadservo-5f15eb5fbfb7a8649132cc8b3a07314389836714.tar.gz
servo-5f15eb5fbfb7a8649132cc8b3a07314389836714.zip
Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-dev.
Diffstat (limited to 'components/style/legacy.rs')
-rw-r--r--components/style/legacy.rs14
1 files changed, 6 insertions, 8 deletions
diff --git a/components/style/legacy.rs b/components/style/legacy.rs
index 65d05514754..d8c1d627491 100644
--- a/components/style/legacy.rs
+++ b/components/style/legacy.rs
@@ -66,14 +66,13 @@ pub trait PresentationalHintSynthesis {
/// `common_style_affecting_attributes` or `rare_style_affecting_attributes` as appropriate. If
/// you don't, you risk strange random nondeterministic failures due to false positives in
/// style sharing.
- fn synthesize_presentational_hints_for_legacy_attributes<'a,E,N,V>(
+ fn synthesize_presentational_hints_for_legacy_attributes<'a,N,V>(
&self,
node: &N,
matching_rules_list: &mut V,
shareable: &mut bool)
- where E: TElement<'a> +
- TElementAttributes,
- N: TNode<'a,E>,
+ where N: TNode<'a>,
+ N::Element: TElementAttributes,
V: VecLike<DeclarationBlock<Vec<PropertyDeclaration>>>;
/// Synthesizes rules for the legacy `bgcolor` attribute.
fn synthesize_presentational_hint_for_legacy_background_color_attribute<'a,E,V>(
@@ -100,14 +99,13 @@ pub trait PresentationalHintSynthesis {
}
impl PresentationalHintSynthesis for Stylist {
- fn synthesize_presentational_hints_for_legacy_attributes<'a,E,N,V>(
+ fn synthesize_presentational_hints_for_legacy_attributes<'a,N,V>(
&self,
node: &N,
matching_rules_list: &mut V,
shareable: &mut bool)
- where E: TElement<'a> +
- TElementAttributes,
- N: TNode<'a,E>,
+ where N: TNode<'a>,
+ N::Element: TElementAttributes,
V: VecLike<DeclarationBlock<Vec<PropertyDeclaration>>> {
let element = node.as_element();
match element.get_local_name() {