diff options
author | Federico Mena Quintero <federico@gnome.org> | 2022-10-24 17:34:34 -0500 |
---|---|---|
committer | Federico Mena Quintero <federico@gnome.org> | 2022-11-04 09:33:33 -0600 |
commit | d621a6bdd0a781c2a54bab6e10703691ac987954 (patch) | |
tree | 97c44cb4c5a0327ea66e09db79078addcb6c8bf3 | |
parent | 68d2650cfc04c6ed2d2257f58c40170ceedc1167 (diff) | |
download | librsvg-d621a6bdd0a781c2a54bab6e10703691ac987954.tar.gz |
Remove unused arguments
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/763>
-rw-r--r-- | src/gradient.rs | 32 | ||||
-rw-r--r-- | src/paint_server.rs | 4 |
2 files changed, 12 insertions, 24 deletions
diff --git a/src/gradient.rs b/src/gradient.rs index 27dff133..345eb7cc 100644 --- a/src/gradient.rs +++ b/src/gradient.rs @@ -408,7 +408,7 @@ impl UnresolvedGradient { /// Looks for <stop> children inside a linearGradient or radialGradient node, /// and adds their info to the UnresolvedGradient &self. - fn add_color_stops_from_node(&mut self, node: &Node, opacity: UnitInterval, session: &Session) { + fn add_color_stops_from_node(&mut self, node: &Node, opacity: UnitInterval) { assert!(matches!( *node.borrow_element(), Element::LinearGradient(_) | Element::RadialGradient(_) @@ -561,12 +561,7 @@ impl Draw for LinearGradient {} macro_rules! impl_gradient { ($gradient_type:ident, $other_type:ident) => { impl $gradient_type { - fn get_unresolved( - &self, - node: &Node, - opacity: UnitInterval, - session: &Session, - ) -> Unresolved { + fn get_unresolved(&self, node: &Node, opacity: UnitInterval) -> Unresolved { let mut gradient = UnresolvedGradient { units: self.common.units, transform: self.common.transform, @@ -575,7 +570,7 @@ macro_rules! impl_gradient { variant: self.get_unresolved_variant(), }; - gradient.add_color_stops_from_node(node, opacity, session); + gradient.add_color_stops_from_node(node, opacity); Unresolved { gradient, @@ -588,12 +583,11 @@ macro_rules! impl_gradient { node: &Node, acquired_nodes: &mut AcquiredNodes<'_>, opacity: UnitInterval, - session: &Session, ) -> Result<ResolvedGradient, AcquireError> { let Unresolved { mut gradient, mut fallback, - } = self.get_unresolved(node, opacity, session); + } = self.get_unresolved(node, opacity); let mut stack = NodeStack::new(); @@ -608,10 +602,10 @@ macro_rules! impl_gradient { let unresolved = match *acquired_node.borrow_element() { Element::$gradient_type(ref g) => { - g.get_unresolved(&acquired_node, opacity, session) + g.get_unresolved(&acquired_node, opacity) } Element::$other_type(ref g) => { - g.get_unresolved(&acquired_node, opacity, session) + g.get_unresolved(&acquired_node, opacity) } _ => return Err(AcquireError::InvalidLinkType(node_id.clone())), }; @@ -744,11 +738,8 @@ mod tests { Attributes::new(), )); - let unresolved = borrow_element_as!(node, LinearGradient).get_unresolved( - &node, - UnitInterval::clamp(1.0), - &session, - ); + let unresolved = borrow_element_as!(node, LinearGradient) + .get_unresolved(&node, UnitInterval::clamp(1.0)); let gradient = unresolved.gradient.resolve_from_defaults(); assert!(gradient.is_resolved()); @@ -758,11 +749,8 @@ mod tests { Attributes::new(), )); - let unresolved = borrow_element_as!(node, RadialGradient).get_unresolved( - &node, - UnitInterval::clamp(1.0), - &session, - ); + let unresolved = borrow_element_as!(node, RadialGradient) + .get_unresolved(&node, UnitInterval::clamp(1.0)); let gradient = unresolved.gradient.resolve_from_defaults(); assert!(gradient.is_resolved()); } diff --git a/src/paint_server.rs b/src/paint_server.rs index 07d8dafc..137435f7 100644 --- a/src/paint_server.rs +++ b/src/paint_server.rs @@ -147,7 +147,7 @@ impl PaintServer { match *node.borrow_element() { Element::LinearGradient(ref g) => { - g.resolve(node, acquired_nodes, opacity, session).map(|g| { + g.resolve(node, acquired_nodes, opacity).map(|g| { Arc::new(PaintSource::Gradient( g, alternate.map(|c| resolve_color(&c, opacity, current_color)), @@ -163,7 +163,7 @@ impl PaintServer { }) } Element::RadialGradient(ref g) => { - g.resolve(node, acquired_nodes, opacity, session).map(|g| { + g.resolve(node, acquired_nodes, opacity).map(|g| { Arc::new(PaintSource::Gradient( g, alternate.map(|c| resolve_color(&c, opacity, current_color)), |