[librsvg: 3/7] Don't re-export individual items from surface_utils

[Federico Mena Quintero <federico src gnome org>]

commit cc684cd6e281a0c7e48e618d17bbea8f3d867bf8
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Oct 28 17:48:27 2020 -0600

    Don't re-export individual items from surface_utils
    
    Have callers import items from rsvg_internals::surface_utils
    explicitly.  I'm not super happy about this; maybe we should
    "pub use *" in surface_utils?

 librsvg/c_api.rs          | 6 +++++-
 librsvg/pixbuf_utils.rs   | 4 +++-
 rsvg_internals/src/lib.rs | 7 -------
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/librsvg/c_api.rs b/librsvg/c_api.rs
index f9227858..563508f4 100644
--- a/librsvg/c_api.rs
+++ b/librsvg/c_api.rs
@@ -58,7 +58,11 @@ use librsvg::{
     SvgHandle,
 };
 
-use rsvg_internals::{rsvg_log, RsvgLength, SharedImageSurface, SurfaceType};
+use rsvg_internals::{
+    rsvg_log,
+    surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
+    RsvgLength,
+};
 
 use crate::dpi::Dpi;
 use crate::messages::{rsvg_g_critical, rsvg_g_warning};
diff --git a/librsvg/pixbuf_utils.rs b/librsvg/pixbuf_utils.rs
index feddf5e6..3766cea3 100644
--- a/librsvg/pixbuf_utils.rs
+++ b/librsvg/pixbuf_utils.rs
@@ -15,7 +15,9 @@ use crate::dpi::Dpi;
 use crate::sizing::LegacySize;
 
 use rsvg_internals::{
-    surface_utils::PixelOps, Pixel, RenderingError, SharedImageSurface, SurfaceType,
+    surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
+    surface_utils::{Pixel, PixelOps},
+    RenderingError,
 };
 
 use crate::c_api::set_gerror;
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index bf07cf9f..14f65d03 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -74,13 +74,6 @@ pub use crate::rect::{IRect, Rect};
 
 pub use crate::structure::IntrinsicDimensions;
 
-pub use crate::surface_utils::{
-    compare_surfaces::{compare_surfaces, BufferDiff, Diff},
-    iterators::Pixels,
-    shared_surface::{SharedImageSurface, SurfaceType},
-    CairoARGB, Pixel,
-};
-
 pub use crate::url_resolver::UrlResolver;
 
 #[macro_use]