[librsvg: 2/7] Use get_chars() instead of get_impl::<NodeChars>() throughout



commit cf816dbd103e0b98b14602bb2dd7299b53078ee5
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Mar 11 10:51:53 2020 -0600

    Use get_chars() instead of get_impl::<NodeChars>() throughout

 rsvg_internals/src/css.rs      | 3 +--
 rsvg_internals/src/document.rs | 2 +-
 rsvg_internals/src/text.rs     | 4 ++--
 rsvg_internals/src/xml.rs      | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/rsvg_internals/src/css.rs b/rsvg_internals/src/css.rs
index 7226f3a7..dcc7d81f 100644
--- a/rsvg_internals/src/css.rs
+++ b/rsvg_internals/src/css.rs
@@ -94,7 +94,6 @@ use crate::error::*;
 use crate::io::{self, BinaryData};
 use crate::node::{NodeCascade, NodeType, RsvgNode};
 use crate::properties::{parse_property, ComputedValues, ParsedProperty};
-use crate::text::NodeChars;
 
 /// A parsed CSS declaration
 ///
@@ -550,7 +549,7 @@ impl selectors::Element for RsvgElement {
         !self.0.has_children()
             || self.0.children().all(|child| {
                 child.borrow().get_type() == NodeType::Chars
-                    && child.borrow().get_impl::<NodeChars>().is_empty()
+                    && child.borrow().get_chars().is_empty()
             })
     }
 
diff --git a/rsvg_internals/src/document.rs b/rsvg_internals/src/document.rs
index 027f82a6..1414b12c 100644
--- a/rsvg_internals/src/document.rs
+++ b/rsvg_internals/src/document.rs
@@ -497,7 +497,7 @@ impl DocumentBuilder {
             child
         };
 
-        chars_node.borrow().get_impl::<NodeChars>().append(text);
+        chars_node.borrow().get_chars().append(text);
     }
 
     pub fn resolve_href(&self, href: &str) -> Result<AllowedUrl, AllowedUrlError> {
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index df22b764..e59af753 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -433,7 +433,7 @@ fn children_to_chunks(
                 let values = cascaded.get();
                 child
                     .borrow()
-                    .get_impl::<NodeChars>()
+                    .get_chars()
                     .to_chunks(&child, values, chunks, dx, dy, depth);
             }
 
@@ -718,7 +718,7 @@ fn extract_chars_children_to_chunks_recursively(
         match child.borrow().get_type() {
             NodeType::Chars => child
                 .borrow()
-                .get_impl::<NodeChars>()
+                .get_chars()
                 .to_chunks(&child, values, chunks, None, None, depth),
             _ => extract_chars_children_to_chunks_recursively(chunks, &child, values, depth + 1),
         }
diff --git a/rsvg_internals/src/xml.rs b/rsvg_internals/src/xml.rs
index ad5456de..2a61c2a6 100644
--- a/rsvg_internals/src/xml.rs
+++ b/rsvg_internals/src/xml.rs
@@ -19,7 +19,6 @@ use crate::limits::MAX_LOADED_ELEMENTS;
 use crate::node::{NodeType, RsvgNode};
 use crate::property_bag::PropertyBag;
 use crate::style::{Style, StyleType};
-use crate::text::NodeChars;
 use crate::xml2_load::Xml2Parser;
 use crate::xml_rs::{reader::XmlEvent, ParserConfig};
 
@@ -374,7 +373,7 @@ impl XmlState {
                     let child_borrow = child.borrow();
 
                     assert!(child_borrow.get_type() == NodeType::Chars);
-                    child_borrow.get_impl::<NodeChars>().get_string()
+                    child_borrow.get_chars().get_string()
                 })
                 .collect::<String>();
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]