[librsvg: 2/53] Move the compare_surfaces module to rsvg_internals

[Federico Mena Quintero <federico src gnome org>]

commit c7b5c7b590b74b14168ba0398961c5fa16e00e32
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Oct 13 11:46:31 2020 -0500

    Move the compare_surfaces module to rsvg_internals
    
    This will make that machinery usable from the standalone
    librsvg/tests, and may even be useful for small-scale unit testing.

 librsvg_crate/tests/standalone/utils/mod.rs                    | 10 +++-------
 rsvg_internals/src/lib.rs                                      |  1 +
 .../src/surface_utils}/compare_surfaces.rs                     |  5 ++---
 rsvg_internals/src/surface_utils/mod.rs                        |  1 +
 4 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/librsvg_crate/tests/standalone/utils/mod.rs b/librsvg_crate/tests/standalone/utils/mod.rs
index 1dadb167..312bd25d 100644
--- a/librsvg_crate/tests/standalone/utils/mod.rs
+++ b/librsvg_crate/tests/standalone/utils/mod.rs
@@ -5,20 +5,16 @@ use glib;
 
 use librsvg;
 use librsvg::{CairoRenderer, Loader, RenderingError, SvgHandle};
-use rsvg_internals;
 
-use self::rsvg_internals::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+use rsvg_internals::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+
+use rsvg_internals::{compare_surfaces, BufferDiff};
 
 use std::env;
 use std::fs::{self, File};
 use std::io::BufReader;
 use std::path::PathBuf;
 
-mod compare_surfaces;
-use self::compare_surfaces::compare_surfaces;
-
-pub use self::compare_surfaces::BufferDiff;
-
 pub fn load_svg(input: &'static [u8]) -> SvgHandle {
     let bytes = glib::Bytes::from_static(input);
     let stream = gio::MemoryInputStream::new_from_bytes(&bytes);
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index 24f24490..e43835bd 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -75,6 +75,7 @@ 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,
diff --git a/librsvg_crate/tests/standalone/utils/compare_surfaces.rs 
b/rsvg_internals/src/surface_utils/compare_surfaces.rs
similarity index 95%
rename from librsvg_crate/tests/standalone/utils/compare_surfaces.rs
rename to rsvg_internals/src/surface_utils/compare_surfaces.rs
index 6f511b8f..226a31de 100644
--- a/librsvg_crate/tests/standalone/utils/compare_surfaces.rs
+++ b/rsvg_internals/src/surface_utils/compare_surfaces.rs
@@ -1,10 +1,9 @@
-use self::rsvg_internals::surface_utils::{
+use super::{
     iterators::Pixels,
     shared_surface::{SharedImageSurface, SurfaceType},
     ImageSurfaceDataExt, Pixel, PixelOps,
 };
-use self::rsvg_internals::{IRect, RenderingError};
-use rsvg_internals;
+use crate::error::RenderingError;
 
 use rgb::ComponentMap;
 
diff --git a/rsvg_internals/src/surface_utils/mod.rs b/rsvg_internals/src/surface_utils/mod.rs
index 0d2d6ec1..1e3d0aa3 100644
--- a/rsvg_internals/src/surface_utils/mod.rs
+++ b/rsvg_internals/src/surface_utils/mod.rs
@@ -4,6 +4,7 @@ use std::mem;
 use std::ops::DerefMut;
 use std::slice;
 
+pub mod compare_surfaces;
 pub mod iterators;
 pub mod shared_surface;
 pub mod srgb;