[librsvg: 1/2] Move xml code to a module

[Federico Mena Quintero <federico src gnome org>]

commit f8a5c3b05221f704356820191889f649d174fe85
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Nov 3 07:45:53 2020 +0100

    Move xml code to a module

 Makefile.am                | 6 +++---
 po/POTFILES.in             | 6 +++---
 src/lib.rs                 | 2 --
 src/{xml.rs => xml/mod.rs} | 6 +++++-
 src/{ => xml}/xml2.rs      | 0
 src/{ => xml}/xml2_load.rs | 5 +++--
 6 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d76a8328..3d6a8246 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,9 +113,9 @@ LIBRSVG_SRC =                                       \
        src/util.rs                             \
        src/viewbox.rs                          \
        src/ua.css                              \
-       src/xml2_load.rs                        \
-       src/xml2.rs                             \
-       src/xml.rs                              \
+       src/xml/mod.rs                          \
+       src/xml/xml2_load.rs                    \
+       src/xml/xml2.rs                         \
        $(NULL)
 
 RUST_EXTRA =                                   \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 36c6ad65..2068ce15 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -82,6 +82,6 @@ src/unit_interval.rs
 src/url_resolver.rs
 src/util.rs
 src/viewbox.rs
-src/xml.rs
-src/xml2.rs
-src/xml2_load.rs
+src/xml/mod.rs
+src/xml/xml2.rs
+src/xml/xml2_load.rs
diff --git a/src/lib.rs b/src/lib.rs
index cc3cc79a..578445f4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -138,8 +138,6 @@ mod url_resolver;
 mod util;
 mod viewbox;
 mod xml;
-mod xml2;
-mod xml2_load;
 
 #[doc(hidden)]
 pub mod doctest_only {
diff --git a/src/xml.rs b/src/xml/mod.rs
similarity index 99%
rename from src/xml.rs
rename to src/xml/mod.rs
index 2721c7cb..6a1727cc 100644
--- a/src/xml.rs
+++ b/src/xml/mod.rs
@@ -22,7 +22,11 @@ use crate::limits::MAX_LOADED_ELEMENTS;
 use crate::node::{Node, NodeBorrow};
 use crate::style::StyleType;
 use crate::url_resolver::AllowedUrl;
-use crate::xml2_load::Xml2Parser;
+
+use xml2_load::Xml2Parser;
+
+mod xml2;
+mod xml2_load;
 
 #[derive(Clone)]
 enum Context {
diff --git a/src/xml2.rs b/src/xml/xml2.rs
similarity index 100%
rename from src/xml2.rs
rename to src/xml/xml2.rs
diff --git a/src/xml2_load.rs b/src/xml/xml2_load.rs
similarity index 99%
rename from src/xml2_load.rs
rename to src/xml/xml2_load.rs
index 2ab2d4ea..e5bdea1a 100644
--- a/src/xml2_load.rs
+++ b/src/xml/xml2_load.rs
@@ -18,8 +18,9 @@ use markup5ever::{namespace_url, ns, LocalName, Namespace, Prefix, QualName};
 use crate::attributes::Attributes;
 use crate::error::LoadingError;
 use crate::util::{cstr, opt_utf8_cstr, utf8_cstr};
-use crate::xml::XmlState;
-use crate::xml2::*;
+
+use super::xml2::*;
+use super::XmlState;
 
 #[rustfmt::skip]
 fn get_xml2_sax_handler() -> xmlSAXHandler {