[librsvg: 14/33] Adjust imports in c_api code

[Federico Mena Quintero <federico src gnome org>]

commit d8110ad68f5a441cbac4a9a52f6b64ec7978f0c1
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Oct 29 18:29:36 2020 -0600

    Adjust imports in c_api code

 src/c_api/c_api.rs        | 14 +++++++-------
 src/c_api/color_utils.rs  |  5 ++++-
 src/c_api/dpi.rs          |  6 +++---
 src/c_api/pixbuf_utils.rs | 14 ++++++--------
 src/c_api/sizing.rs       |  6 +++---
 5 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/src/c_api/c_api.rs b/src/c_api/c_api.rs
index 563508f4..2b966af8 100644
--- a/src/c_api/c_api.rs
+++ b/src/c_api/c_api.rs
@@ -53,21 +53,21 @@ use glib::types::instance_of;
 
 use gobject_sys::{GEnumValue, GFlagsValue};
 
-use librsvg::{
+use crate::api::{
     CairoRenderer, DefsLookupErrorKind, IntrinsicDimensions, Loader, LoadingError, RenderingError,
     SvgHandle,
 };
 
-use rsvg_internals::{
+use crate::{
     rsvg_log,
     surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
-    RsvgLength,
+    length::RsvgLength,
 };
 
-use crate::dpi::Dpi;
-use crate::messages::{rsvg_g_critical, rsvg_g_warning};
-use crate::pixbuf_utils::{empty_pixbuf, pixbuf_from_surface};
-use crate::sizing::LegacySize;
+use super::dpi::Dpi;
+use super::messages::{rsvg_g_critical, rsvg_g_warning};
+use super::pixbuf_utils::{empty_pixbuf, pixbuf_from_surface};
+use super::sizing::LegacySize;
 
 include!(concat!(env!("OUT_DIR"), "/version.rs"));
 
diff --git a/src/c_api/color_utils.rs b/src/c_api/color_utils.rs
index 7f2c4279..97e853b2 100644
--- a/src/c_api/color_utils.rs
+++ b/src/c_api/color_utils.rs
@@ -1,6 +1,9 @@
 use std::ffi::CStr;
 
-use rsvg_internals::{Color, Parse};
+use crate::{
+    color::Color,
+    parsers::Parse,
+};
 
 // There are two quirks here:
 //
diff --git a/src/c_api/dpi.rs b/src/c_api/dpi.rs
index c27667d8..80282947 100644
--- a/src/c_api/dpi.rs
+++ b/src/c_api/dpi.rs
@@ -45,9 +45,9 @@ impl Dpi {
     }
 }
 
-impl From<Dpi> for rsvg_internals::Dpi {
-    fn from(dpi: Dpi) -> rsvg_internals::Dpi {
-        rsvg_internals::Dpi::new(dpi.x(), dpi.y())
+impl From<Dpi> for crate::dpi::Dpi {
+    fn from(dpi: Dpi) -> crate::dpi::Dpi {
+        crate::dpi::Dpi::new(dpi.x(), dpi.y())
     }
 }
 
diff --git a/src/c_api/pixbuf_utils.rs b/src/c_api/pixbuf_utils.rs
index 3766cea3..dc7564fe 100644
--- a/src/c_api/pixbuf_utils.rs
+++ b/src/c_api/pixbuf_utils.rs
@@ -7,21 +7,19 @@ use std::ptr;
 
 use gdk_pixbuf::{Colorspace, Pixbuf};
 use glib::translate::*;
-use librsvg::{CairoRenderer, Loader};
 use rgb::FromSlice;
 
-use crate::c_api::checked_i32;
-use crate::dpi::Dpi;
-use crate::sizing::LegacySize;
+use crate::api::{CairoRenderer, Loader};
+use super::c_api::{checked_i32, set_gerror};
+use super::dpi::Dpi;
+use super::sizing::LegacySize;
 
-use rsvg_internals::{
+use crate::{
     surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
     surface_utils::{Pixel, PixelOps},
-    RenderingError,
+    error::RenderingError,
 };
 
-use crate::c_api::set_gerror;
-
 fn pixbuf_new(width: i32, height: i32) -> Result<Pixbuf, RenderingError> {
     assert!(width > 0 && height > 0);
 
diff --git a/src/c_api/sizing.rs b/src/c_api/sizing.rs
index 1e0b996b..b88ae6f3 100644
--- a/src/c_api/sizing.rs
+++ b/src/c_api/sizing.rs
@@ -1,7 +1,7 @@
 use float_cmp::approx_eq;
-use librsvg::{CairoRenderer, IntrinsicDimensions, Length, RenderingError};
+use crate::api::{CairoRenderer, IntrinsicDimensions, Length, RenderingError};
 
-use crate::c_api::unit_rectangle;
+use super::c_api::unit_rectangle;
 
 pub trait LegacySize {
     /// Returns the SVG's size suitable for the legacy C API.
@@ -51,7 +51,7 @@ fn size_in_pixels_from_percentage_width_and_height(
         vbox,
     } = *dim;
 
-    use librsvg::LengthUnit::*;
+    use crate::api::LengthUnit::*;
 
     // If both width and height are 100%, just use the vbox size as a pixel size.
     // This gives a size with the correct aspect ratio.