[librsvg: 6/7] Don't export the whole rect module; we already export IRect for benchmarks




commit 0fd2aed41bea3cd01475ab22d202f7c6ee805657
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Oct 28 18:16:31 2020 -0600

    Don't export the whole rect module; we already export IRect for benchmarks

 librsvg/benches/pixbuf_from_surface.rs    | 10 ++++++----
 librsvg/lib.rs                            |  2 +-
 rsvg_internals/benches/box_blur.rs        |  8 +++++---
 rsvg_internals/benches/composite.rs       |  8 +++++---
 rsvg_internals/benches/lighting.rs        | 14 ++++++++------
 rsvg_internals/benches/pixel_iterators.rs | 10 ++++++----
 rsvg_internals/benches/srgb.rs            | 12 +++++++-----
 rsvg_internals/src/lib.rs                 |  2 +-
 8 files changed, 39 insertions(+), 27 deletions(-)
---
diff --git a/librsvg/benches/pixbuf_from_surface.rs b/librsvg/benches/pixbuf_from_surface.rs
index ddc84cd7..8c696130 100644
--- a/librsvg/benches/pixbuf_from_surface.rs
+++ b/librsvg/benches/pixbuf_from_surface.rs
@@ -1,10 +1,12 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use rsvg_c_api::pixbuf_utils::pixbuf_from_surface;
-use rsvg_internals::rect::IRect;
-use rsvg_internals::surface_utils::{
-    shared_surface::{ExclusiveImageSurface, SurfaceType},
-    ImageSurfaceDataExt, Pixel,
+use rsvg_internals::{
+    surface_utils::{
+        shared_surface::{ExclusiveImageSurface, SurfaceType},
+        ImageSurfaceDataExt, Pixel,
+    },
+    IRect,
 };
 
 const BOUNDS: IRect = IRect {
diff --git a/librsvg/lib.rs b/librsvg/lib.rs
index b56de28b..136a4e0c 100644
--- a/librsvg/lib.rs
+++ b/librsvg/lib.rs
@@ -53,5 +53,5 @@ mod messages;
 mod c_api;
 mod color_utils;
 mod dpi;
-mod pixbuf_utils;
+pub mod pixbuf_utils;
 mod sizing;
diff --git a/rsvg_internals/benches/box_blur.rs b/rsvg_internals/benches/box_blur.rs
index 3647d150..a8e60040 100644
--- a/rsvg_internals/benches/box_blur.rs
+++ b/rsvg_internals/benches/box_blur.rs
@@ -1,8 +1,10 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 
-use rsvg_internals::rect::IRect;
-use rsvg_internals::surface_utils::shared_surface::{
-    AlphaOnly, Horizontal, NotAlphaOnly, SharedImageSurface, SurfaceType, Vertical,
+use rsvg_internals::{
+    surface_utils::shared_surface::{
+        AlphaOnly, Horizontal, NotAlphaOnly, SharedImageSurface, SurfaceType, Vertical,
+    },
+    IRect,
 };
 
 const SURFACE_SIDE: i32 = 512;
diff --git a/rsvg_internals/benches/composite.rs b/rsvg_internals/benches/composite.rs
index 558e98ae..9ba8c2b6 100644
--- a/rsvg_internals/benches/composite.rs
+++ b/rsvg_internals/benches/composite.rs
@@ -1,8 +1,10 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use rsvg_internals::rect::IRect;
-use rsvg_internals::surface_utils::shared_surface::{
-    composite_arithmetic, ExclusiveImageSurface, SharedImageSurface, SurfaceType,
+use rsvg_internals::{
+    surface_utils::shared_surface::{
+        composite_arithmetic, ExclusiveImageSurface, SharedImageSurface, SurfaceType,
+    },
+    IRect,
 };
 
 const SURFACE_SIDE: i32 = 512;
diff --git a/rsvg_internals/benches/lighting.rs b/rsvg_internals/benches/lighting.rs
index 8a57b0a5..5b3031c0 100644
--- a/rsvg_internals/benches/lighting.rs
+++ b/rsvg_internals/benches/lighting.rs
@@ -1,12 +1,14 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use nalgebra::{Matrix3, Vector2};
 
-use rsvg_internals::filters::lighting::Normal;
-use rsvg_internals::rect::IRect;
-use rsvg_internals::surface_utils::{
-    iterators::{PixelRectangle, Pixels},
-    shared_surface::{SharedImageSurface, SurfaceType},
-    EdgeMode,
+use rsvg_internals::{
+    filters::lighting::Normal,
+    surface_utils::{
+        iterators::{PixelRectangle, Pixels},
+        shared_surface::{SharedImageSurface, SurfaceType},
+        EdgeMode,
+    },
+    IRect,
 };
 
 /// Computes and returns the normal vector for the light filters.
diff --git a/rsvg_internals/benches/pixel_iterators.rs b/rsvg_internals/benches/pixel_iterators.rs
index 189f5ab8..7be769f4 100644
--- a/rsvg_internals/benches/pixel_iterators.rs
+++ b/rsvg_internals/benches/pixel_iterators.rs
@@ -1,9 +1,11 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use rsvg_internals::rect::IRect;
-use rsvg_internals::surface_utils::{
-    iterators::Pixels,
-    shared_surface::{ExclusiveImageSurface, SharedImageSurface, SurfaceType},
+use rsvg_internals::{
+    surface_utils::{
+        iterators::Pixels,
+        shared_surface::{ExclusiveImageSurface, SharedImageSurface, SurfaceType},
+    },
+    IRect,
 };
 
 const SURFACE_SIDE: i32 = 512;
diff --git a/rsvg_internals/benches/srgb.rs b/rsvg_internals/benches/srgb.rs
index 2b9dda97..56780b27 100644
--- a/rsvg_internals/benches/srgb.rs
+++ b/rsvg_internals/benches/srgb.rs
@@ -1,10 +1,12 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use rsvg_internals::rect::IRect;
-use rsvg_internals::surface_utils::{
-    shared_surface::{ExclusiveImageSurface, SurfaceType},
-    srgb::{linearize, map_unpremultiplied_components_loop},
-    ImageSurfaceDataExt, Pixel,
+use rsvg_internals::{
+    surface_utils::{
+        shared_surface::{ExclusiveImageSurface, SurfaceType},
+        srgb::{linearize, map_unpremultiplied_components_loop},
+        ImageSurfaceDataExt, Pixel,
+    },
+    IRect,
 };
 
 const SURFACE_SIDE: i32 = 512;
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index 14f65d03..07b36599 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -126,7 +126,7 @@ pub mod path_parser; // pub for benchmarking
 mod pattern;
 mod properties;
 mod property_defs;
-pub mod rect;
+mod rect;
 mod shapes;
 mod space;
 mod structure;


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