[librsvg: 2/7] element: remove parent argument from set_atts
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 2/7] element: remove parent argument from set_atts
- Date: Mon, 30 Mar 2020 16:05:40 +0000 (UTC)
commit e409cea2221e95b6c7204ac2ed0c0fdefb5e6b50
Author: Paolo Borelli <pborelli gnome org>
Date: Sat Mar 28 12:29:49 2020 +0100
element: remove parent argument from set_atts
We do not need it anymore
rsvg_internals/src/document.rs | 7 ++-----
rsvg_internals/src/element.rs | 6 +++---
rsvg_internals/src/filter.rs | 3 +--
rsvg_internals/src/filters/blend.rs | 4 ++--
rsvg_internals/src/filters/color_matrix.rs | 4 ++--
rsvg_internals/src/filters/component_transfer.rs | 10 +++-------
rsvg_internals/src/filters/composite.rs | 4 ++--
rsvg_internals/src/filters/convolve_matrix.rs | 4 ++--
rsvg_internals/src/filters/displacement_map.rs | 4 ++--
rsvg_internals/src/filters/flood.rs | 4 ++--
rsvg_internals/src/filters/gaussian_blur.rs | 4 ++--
rsvg_internals/src/filters/image.rs | 4 ++--
rsvg_internals/src/filters/light/light_source.rs | 7 +++----
rsvg_internals/src/filters/light/lighting.rs | 12 ++++++------
rsvg_internals/src/filters/merge.rs | 6 +++---
rsvg_internals/src/filters/mod.rs | 6 +++---
rsvg_internals/src/filters/morphology.rs | 4 ++--
rsvg_internals/src/filters/offset.rs | 4 ++--
rsvg_internals/src/filters/tile.rs | 4 ++--
rsvg_internals/src/filters/turbulence.rs | 4 ++--
rsvg_internals/src/gradient.rs | 6 +++---
rsvg_internals/src/image.rs | 2 +-
rsvg_internals/src/marker.rs | 2 +-
rsvg_internals/src/pattern.rs | 2 +-
rsvg_internals/src/shapes.rs | 14 +++++++-------
rsvg_internals/src/structure.rs | 18 +++++++++---------
rsvg_internals/src/style.rs | 3 +--
rsvg_internals/src/text.rs | 6 +++---
28 files changed, 74 insertions(+), 84 deletions(-)
---
diff --git a/rsvg_internals/src/document.rs b/rsvg_internals/src/document.rs
index a3db4a91..e93d50b9 100644
--- a/rsvg_internals/src/document.rs
+++ b/rsvg_internals/src/document.rs
@@ -462,11 +462,8 @@ impl DocumentBuilder {
.or_insert_with(|| node.clone());
}
- node.borrow_element_mut().set_atts(
- parent.as_ref().clone(),
- pbag,
- self.load_options.locale(),
- );
+ node.borrow_element_mut()
+ .set_atts(pbag, self.load_options.locale());
if let Some(mut parent) = parent {
parent.append(node.clone());
diff --git a/rsvg_internals/src/element.rs b/rsvg_internals/src/element.rs
index 2b44ddb5..619287a8 100644
--- a/rsvg_internals/src/element.rs
+++ b/rsvg_internals/src/element.rs
@@ -138,7 +138,7 @@ pub trait ElementTrait: Downcast {
/// Sets per-element attributes from the `pbag`
///
/// Each element is supposed to iterate the `pbag`, and parse any attributes it needs.
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult;
/// Sets any special-cased properties that the element may have, that are different
/// from defaults in the element's `SpecifiedValues`.
@@ -229,13 +229,13 @@ impl Element {
self.transform
}
- pub fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>, locale: &Locale) {
+ pub fn set_atts(&mut self, pbag: &PropertyBag<'_>, locale: &Locale) {
self.save_style_attribute(pbag);
if let Err(e) = self
.set_transform_attribute(pbag)
.and_then(|_| self.set_conditional_processing_attributes(pbag, locale))
- .and_then(|_| self.element_impl.set_atts(parent, pbag))
+ .and_then(|_| self.element_impl.set_atts(pbag))
.and_then(|_| self.set_presentation_attributes(pbag))
{
self.set_error(e);
diff --git a/rsvg_internals/src/filter.rs b/rsvg_internals/src/filter.rs
index 5553010d..6615a540 100644
--- a/rsvg_internals/src/filter.rs
+++ b/rsvg_internals/src/filter.rs
@@ -8,7 +8,6 @@ use crate::drawing_ctx::DrawingCtx;
use crate::element::{ElementResult, ElementTrait};
use crate::error::ValueErrorKind;
use crate::length::*;
-use crate::node::Node;
use crate::parsers::{Parse, ParseValue};
use crate::properties::ComputedValues;
use crate::property_bag::PropertyBag;
@@ -112,7 +111,7 @@ impl Filter {
}
impl ElementTrait for Filter {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
// Parse filterUnits first as it affects x, y, width, height checks.
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/blend.rs b/rsvg_internals/src/filters/blend.rs
index 1fc53a4d..20f8f71f 100755
--- a/rsvg_internals/src/filters/blend.rs
+++ b/rsvg_internals/src/filters/blend.rs
@@ -56,8 +56,8 @@ impl Default for FeBlend {
impl ElementTrait for FeBlend {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/color_matrix.rs b/rsvg_internals/src/filters/color_matrix.rs
index 53fce725..8130abf8 100644
--- a/rsvg_internals/src/filters/color_matrix.rs
+++ b/rsvg_internals/src/filters/color_matrix.rs
@@ -54,8 +54,8 @@ impl Default for FeColorMatrix {
impl ElementTrait for FeColorMatrix {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
// First, determine the operation type.
let mut operation_type = Default::default();
diff --git a/rsvg_internals/src/filters/component_transfer.rs
b/rsvg_internals/src/filters/component_transfer.rs
index 8bab7c51..940db4e8 100644
--- a/rsvg_internals/src/filters/component_transfer.rs
+++ b/rsvg_internals/src/filters/component_transfer.rs
@@ -38,8 +38,8 @@ impl ElementTrait for FeComponentTransfer {
impl_node_as_filter_effect!();
#[inline]
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)
}
}
@@ -201,11 +201,7 @@ macro_rules! func_x {
impl ElementTrait for $func_name {
#[inline]
- fn set_atts(
- &mut self,
- _parent: Option<&Node>,
- pbag: &PropertyBag<'_>,
- ) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "type") => self.function_type = attr.parse(value)?,
diff --git a/rsvg_internals/src/filters/composite.rs b/rsvg_internals/src/filters/composite.rs
index e3f88a50..2aad6232 100644
--- a/rsvg_internals/src/filters/composite.rs
+++ b/rsvg_internals/src/filters/composite.rs
@@ -54,8 +54,8 @@ impl Default for FeComposite {
impl ElementTrait for FeComposite {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/convolve_matrix.rs b/rsvg_internals/src/filters/convolve_matrix.rs
index 5c9c3871..76b3b7c1 100644
--- a/rsvg_internals/src/filters/convolve_matrix.rs
+++ b/rsvg_internals/src/filters/convolve_matrix.rs
@@ -57,8 +57,8 @@ impl Default for FeConvolveMatrix {
impl ElementTrait for FeConvolveMatrix {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/displacement_map.rs b/rsvg_internals/src/filters/displacement_map.rs
index 1ccce732..aa8ba833 100644
--- a/rsvg_internals/src/filters/displacement_map.rs
+++ b/rsvg_internals/src/filters/displacement_map.rs
@@ -48,8 +48,8 @@ impl Default for FeDisplacementMap {
impl ElementTrait for FeDisplacementMap {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/flood.rs b/rsvg_internals/src/filters/flood.rs
index c4df15d2..7cb4da94 100644
--- a/rsvg_internals/src/filters/flood.rs
+++ b/rsvg_internals/src/filters/flood.rs
@@ -26,8 +26,8 @@ impl ElementTrait for FeFlood {
impl_node_as_filter_effect!();
#[inline]
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)
}
}
diff --git a/rsvg_internals/src/filters/gaussian_blur.rs b/rsvg_internals/src/filters/gaussian_blur.rs
index a23e443d..d19ad332 100644
--- a/rsvg_internals/src/filters/gaussian_blur.rs
+++ b/rsvg_internals/src/filters/gaussian_blur.rs
@@ -45,8 +45,8 @@ impl Default for FeGaussianBlur {
impl ElementTrait for FeGaussianBlur {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/image.rs b/rsvg_internals/src/filters/image.rs
index 1fdc2720..b03cfa71 100644
--- a/rsvg_internals/src/filters/image.rs
+++ b/rsvg_internals/src/filters/image.rs
@@ -113,8 +113,8 @@ impl FeImage {
impl ElementTrait for FeImage {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/light/light_source.rs
b/rsvg_internals/src/filters/light/light_source.rs
index 665523b5..77751c9c 100644
--- a/rsvg_internals/src/filters/light/light_source.rs
+++ b/rsvg_internals/src/filters/light/light_source.rs
@@ -4,7 +4,6 @@ use nalgebra::Vector3;
use crate::element::{ElementResult, ElementTrait};
use crate::filters::context::FilterContext;
-use crate::node::Node;
use crate::parsers::ParseValue;
use crate::property_bag::PropertyBag;
use crate::util::clamp;
@@ -104,7 +103,7 @@ impl FeDistantLight {
}
impl ElementTrait for FeDistantLight {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "azimuth") => self.azimuth = attr.parse(value)?,
@@ -136,7 +135,7 @@ impl FePointLight {
}
impl ElementTrait for FePointLight {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value)?,
@@ -185,7 +184,7 @@ impl FeSpotLight {
}
impl ElementTrait for FeSpotLight {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value)?,
diff --git a/rsvg_internals/src/filters/light/lighting.rs b/rsvg_internals/src/filters/light/lighting.rs
index d2a68992..0df64e1c 100644
--- a/rsvg_internals/src/filters/light/lighting.rs
+++ b/rsvg_internals/src/filters/light/lighting.rs
@@ -49,8 +49,8 @@ impl Common {
}
}
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
@@ -96,8 +96,8 @@ impl Default for FeDiffuseLighting {
impl ElementTrait for FeDiffuseLighting {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.common.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.common.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
@@ -165,8 +165,8 @@ impl Default for FeSpecularLighting {
impl ElementTrait for FeSpecularLighting {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.common.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.common.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/merge.rs b/rsvg_internals/src/filters/merge.rs
index c1ec6016..d7124f48 100644
--- a/rsvg_internals/src/filters/merge.rs
+++ b/rsvg_internals/src/filters/merge.rs
@@ -38,14 +38,14 @@ impl ElementTrait for FeMerge {
impl_node_as_filter_effect!();
#[inline]
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)
}
}
impl ElementTrait for FeMergeNode {
#[inline]
- fn set_atts(&mut self, _parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "in") => self.in_ = Some(attr.parse(value)?),
diff --git a/rsvg_internals/src/filters/mod.rs b/rsvg_internals/src/filters/mod.rs
index 535c1725..b6fb027d 100644
--- a/rsvg_internals/src/filters/mod.rs
+++ b/rsvg_internals/src/filters/mod.rs
@@ -178,7 +178,7 @@ impl Primitive {
}
impl ElementTrait for Primitive {
- fn set_atts(&mut self, _parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = Some(attr.parse(value)?),
@@ -224,8 +224,8 @@ impl PrimitiveWithInput {
}
impl ElementTrait for PrimitiveWithInput {
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/morphology.rs b/rsvg_internals/src/filters/morphology.rs
index 915a351c..46a0ce32 100644
--- a/rsvg_internals/src/filters/morphology.rs
+++ b/rsvg_internals/src/filters/morphology.rs
@@ -48,8 +48,8 @@ impl Default for FeMorphology {
impl ElementTrait for FeMorphology {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/offset.rs b/rsvg_internals/src/filters/offset.rs
index ac64f4cd..73da2261 100644
--- a/rsvg_internals/src/filters/offset.rs
+++ b/rsvg_internals/src/filters/offset.rs
@@ -32,8 +32,8 @@ impl Default for FeOffset {
impl ElementTrait for FeOffset {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/filters/tile.rs b/rsvg_internals/src/filters/tile.rs
index 1029ac1b..1f92a817 100644
--- a/rsvg_internals/src/filters/tile.rs
+++ b/rsvg_internals/src/filters/tile.rs
@@ -25,8 +25,8 @@ impl Default for FeTile {
impl ElementTrait for FeTile {
impl_node_as_filter_effect!();
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)
}
}
diff --git a/rsvg_internals/src/filters/turbulence.rs b/rsvg_internals/src/filters/turbulence.rs
index ec7a6bbe..43b4f6ef 100644
--- a/rsvg_internals/src/filters/turbulence.rs
+++ b/rsvg_internals/src/filters/turbulence.rs
@@ -60,8 +60,8 @@ impl ElementTrait for FeTurbulence {
impl_node_as_filter_effect!();
#[inline]
- fn set_atts(&mut self, parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
- self.base.set_atts(parent, pbag)?;
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
+ self.base.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
match attr.expanded() {
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index 6ab3da94..083de919 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -93,7 +93,7 @@ fn validate_offset(length: Length<Both>) -> Result<Length<Both>, ValueErrorKind>
}
impl ElementTrait for Stop {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "offset") => {
@@ -614,7 +614,7 @@ impl Common {
}
impl ElementTrait for LinearGradient {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
self.common.set_atts(pbag)?;
for (attr, value) in pbag.iter() {
@@ -633,7 +633,7 @@ impl ElementTrait for LinearGradient {
}
impl ElementTrait for RadialGradient {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
self.common.set_atts(pbag)?;
// Create a local expanded name for "fr" because markup5ever doesn't have built-in
let expanded_name_fr = ExpandedName {
diff --git a/rsvg_internals/src/image.rs b/rsvg_internals/src/image.rs
index 55c884cc..fd1c0877 100644
--- a/rsvg_internals/src/image.rs
+++ b/rsvg_internals/src/image.rs
@@ -28,7 +28,7 @@ pub struct Image {
}
impl ElementTrait for Image {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value)?,
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index c98c9e05..0ed54e0a 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -176,7 +176,7 @@ impl Marker {
}
impl ElementTrait for Marker {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "markerUnits") => self.units = attr.parse(value)?,
diff --git a/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
index 870c953b..9f521224 100644
--- a/rsvg_internals/src/pattern.rs
+++ b/rsvg_internals/src/pattern.rs
@@ -119,7 +119,7 @@ pub struct Pattern {
}
impl ElementTrait for Pattern {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "patternUnits") => self.common.units = Some(attr.parse(value)?),
diff --git a/rsvg_internals/src/shapes.rs b/rsvg_internals/src/shapes.rs
index ba1916df..b08355eb 100644
--- a/rsvg_internals/src/shapes.rs
+++ b/rsvg_internals/src/shapes.rs
@@ -116,7 +116,7 @@ pub struct Path {
}
impl ElementTrait for Path {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
if attr.expanded() == expanded_name!("", "d") {
let mut builder = PathBuilder::new();
@@ -220,7 +220,7 @@ pub struct Polygon {
}
impl ElementTrait for Polygon {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
if attr.expanded() == expanded_name!("", "points") {
self.points = attr.parse(value).map(Some)?;
@@ -255,7 +255,7 @@ pub struct Polyline {
}
impl ElementTrait for Polyline {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
if attr.expanded() == expanded_name!("", "points") {
self.points = attr.parse(value).map(Some)?;
@@ -291,7 +291,7 @@ pub struct Line {
}
impl ElementTrait for Line {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x1") => self.x1 = attr.parse(value)?,
@@ -355,7 +355,7 @@ pub struct Rect {
}
impl ElementTrait for Rect {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value)?,
@@ -585,7 +585,7 @@ pub struct Circle {
}
impl ElementTrait for Circle {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "cx") => self.cx = attr.parse(value)?,
@@ -640,7 +640,7 @@ pub struct Ellipse {
}
impl ElementTrait for Ellipse {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "cx") => self.cx = attr.parse(value)?,
diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
index db95138d..16363ba3 100644
--- a/rsvg_internals/src/structure.rs
+++ b/rsvg_internals/src/structure.rs
@@ -23,7 +23,7 @@ use crate::viewbox::*;
pub struct Group();
impl ElementTrait for Group {
- fn set_atts(&mut self, _: Option<&Node>, _: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, _: &PropertyBag<'_>) -> ElementResult {
Ok(())
}
@@ -51,7 +51,7 @@ impl ElementTrait for Group {
pub struct NonRendering;
impl ElementTrait for NonRendering {
- fn set_atts(&mut self, _: Option<&Node>, _: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, _: &PropertyBag<'_>) -> ElementResult {
Ok(())
}
}
@@ -60,7 +60,7 @@ impl ElementTrait for NonRendering {
pub struct Switch();
impl ElementTrait for Switch {
- fn set_atts(&mut self, _: Option<&Node>, _: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, _: &PropertyBag<'_>) -> ElementResult {
Ok(())
}
@@ -187,7 +187,7 @@ impl Svg {
}
impl ElementTrait for Svg {
- fn set_atts(&mut self, _parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "preserveAspectRatio") => {
@@ -304,7 +304,7 @@ impl Use {
}
impl ElementTrait for Use {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!(xlink "href") => {
@@ -358,7 +358,7 @@ impl Symbol {
}
impl ElementTrait for Symbol {
- fn set_atts(&mut self, _parent: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "preserveAspectRatio") => {
@@ -387,7 +387,7 @@ impl ClipPath {
}
impl ElementTrait for ClipPath {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "clipPathUnits") => self.units = attr.parse(value)?,
@@ -447,7 +447,7 @@ impl Mask {
}
impl ElementTrait for Mask {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value)?,
@@ -476,7 +476,7 @@ pub struct Link {
}
impl ElementTrait for Link {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!(xlink "href") => self.link = Some(value.to_owned()),
diff --git a/rsvg_internals/src/style.rs b/rsvg_internals/src/style.rs
index 8c40d381..1388ae03 100644
--- a/rsvg_internals/src/style.rs
+++ b/rsvg_internals/src/style.rs
@@ -4,7 +4,6 @@ use markup5ever::{expanded_name, local_name, namespace_url, ns};
use crate::element::{ElementResult, ElementTrait};
use crate::error::*;
-use crate::node::Node;
use crate::property_bag::PropertyBag;
/// Represents the syntax used in the <style> node.
@@ -52,7 +51,7 @@ impl Style {
}
impl ElementTrait for Style {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
if attr.expanded() == expanded_name!("", "type") {
self.type_ = Some(StyleType::parse(value).attribute(attr)?);
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index 1254def1..9122f88d 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -605,7 +605,7 @@ impl Text {
}
impl ElementTrait for Text {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value)?,
@@ -724,7 +724,7 @@ fn extract_chars_children_to_chunks_recursively(
}
impl ElementTrait for TRef {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!(xlink "href") => {
@@ -773,7 +773,7 @@ impl TSpan {
}
impl ElementTrait for TSpan {
- fn set_atts(&mut self, _: Option<&Node>, pbag: &PropertyBag<'_>) -> ElementResult {
+ fn set_atts(&mut self, pbag: &PropertyBag<'_>) -> ElementResult {
for (attr, value) in pbag.iter() {
match attr.expanded() {
expanded_name!("", "x") => self.x = attr.parse(value).map(Some)?,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
