[librsvg: 9/16] Inline load_from_possibly_compressed_stream() into its single caller



commit 2c25647b865eceeee68530cd106a2f99eb006787
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Oct 11 10:22:14 2019 -0500

    Inline load_from_possibly_compressed_stream() into its single caller

 rsvg_internals/src/xml.rs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/rsvg_internals/src/xml.rs b/rsvg_internals/src/xml.rs
index e27d1e4d..dbcc8547 100644
--- a/rsvg_internals/src/xml.rs
+++ b/rsvg_internals/src/xml.rs
@@ -493,17 +493,6 @@ impl XmlState {
             .and_then(|parser| parser.parse())
     }
 
-    fn load_from_possibly_compressed_stream<S: IsA<gio::InputStream>>(
-        &mut self,
-        stream: &S,
-        cancellable: Option<&gio::Cancellable>,
-    ) -> Result<(), ParseFromStreamError> {
-        let stream = get_input_stream_for_loading(stream, cancellable)
-            .map_err(|e| ParseFromStreamError::IoError(e))?;
-
-        self.parse_from_stream(stream, cancellable)
-    }
-
     fn unsupported_xinclude_start_element(&self, _name: &str) -> Context {
         Context::UnsupportedXIncludeChild
     }
@@ -567,7 +556,10 @@ pub fn xml_load_from_possibly_compressed_stream<S: IsA<gio::InputStream>>(
 ) -> Result<Svg, LoadingError> {
     let mut xml = XmlState::new(load_options);
 
-    xml.load_from_possibly_compressed_stream(stream, cancellable)?;
+    let stream = get_input_stream_for_loading(stream, cancellable)
+        .map_err(|e| ParseFromStreamError::IoError(e))?;
+
+    xml.parse_from_stream(stream, cancellable)?;
 
     xml.steal_result()
 }


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