Move librsvg-c/src/c_api/* one directory up

librsvg-c/src/lib.rs just had "pub mod c_api;", so let's pull
everything one directory up.

This will also make it slightly easier to fix the toplevel Makefile.am.

Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>

8 files changed, 59 insertions, 60 deletions

diff --git a/librsvg-c/src/c_api/mod.rs b/librsvg-c/src/c_api/mod.rs
deleted file mode 100644
index febca033..00000000
--- a/librsvg-c/src/c_api/mod.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-//! C API for librsvg, based on GObject.
-//!
-//! The main API is in the [`handle`] module.  The other modules
-//! have utility functions and the legacy [pixbuf-based API][pixbuf_utils].
-
-#![allow(clippy::missing_safety_doc)]
-
-#[rustfmt::skip]
-pub use handle::{
-    rsvg_error_get_type,
-    rsvg_handle_close,
-    rsvg_handle_flags_get_type,
-    rsvg_handle_get_base_uri,
-    rsvg_handle_get_dimensions,
-    rsvg_handle_get_dimensions_sub,
-    rsvg_handle_get_geometry_for_element,
-    rsvg_handle_get_geometry_for_layer,
-    rsvg_handle_get_intrinsic_dimensions,
-    rsvg_handle_get_intrinsic_size_in_pixels,
-    rsvg_handle_get_pixbuf_sub,
-    rsvg_handle_get_position_sub,
-    rsvg_handle_has_sub,
-    rsvg_handle_internal_set_testing,
-    rsvg_handle_new_from_data,
-    rsvg_handle_new_from_file,
-    rsvg_handle_new_from_gfile_sync,
-    rsvg_handle_new_from_stream_sync,
-    rsvg_handle_new_with_flags,
-    rsvg_handle_read_stream_sync,
-    rsvg_handle_render_cairo_sub,
-    rsvg_handle_render_element,
-    rsvg_handle_render_document,
-    rsvg_handle_render_layer,
-    rsvg_handle_set_base_gfile,
-    rsvg_handle_set_base_uri,
-    rsvg_handle_set_dpi_x_y,
-    rsvg_handle_set_size_callback,
-    rsvg_handle_write,
-};
-
-pub use dpi::{rsvg_set_default_dpi, rsvg_set_default_dpi_x_y};
-
-#[rustfmt::skip]
-pub use pixbuf_utils::{
-    rsvg_pixbuf_from_file,
-    rsvg_pixbuf_from_file_at_max_size,
-    rsvg_pixbuf_from_file_at_size,
-    rsvg_pixbuf_from_file_at_zoom,
-    rsvg_pixbuf_from_file_at_zoom_with_max,
-};
-
-#[macro_use]
-mod messages;
-
-mod dpi;
-pub mod handle;
-pub mod pixbuf_utils;
-pub mod sizing;
diff --git a/librsvg-c/src/c_api/dpi.rs b/librsvg-c/src/dpi.rs
index b2e15eef..b2e15eef 100644
--- a/librsvg-c/src/c_api/dpi.rs
+++ b/librsvg-c/src/dpi.rs
diff --git a/librsvg-c/src/c_api/handle.rs b/librsvg-c/src/handle.rs
index 3ab6acc5..3ab6acc5 100644
--- a/librsvg-c/src/c_api/handle.rs
+++ b/librsvg-c/src/handle.rs
diff --git a/librsvg-c/src/lib.rs b/librsvg-c/src/lib.rs
index 3b543815..febca033 100644
--- a/librsvg-c/src/lib.rs
+++ b/librsvg-c/src/lib.rs
@@ -1 +1,58 @@
-pub mod c_api;
+//! C API for librsvg, based on GObject.
+//!
+//! The main API is in the [`handle`] module.  The other modules
+//! have utility functions and the legacy [pixbuf-based API][pixbuf_utils].
+
+#![allow(clippy::missing_safety_doc)]
+
+#[rustfmt::skip]
+pub use handle::{
+    rsvg_error_get_type,
+    rsvg_handle_close,
+    rsvg_handle_flags_get_type,
+    rsvg_handle_get_base_uri,
+    rsvg_handle_get_dimensions,
+    rsvg_handle_get_dimensions_sub,
+    rsvg_handle_get_geometry_for_element,
+    rsvg_handle_get_geometry_for_layer,
+    rsvg_handle_get_intrinsic_dimensions,
+    rsvg_handle_get_intrinsic_size_in_pixels,
+    rsvg_handle_get_pixbuf_sub,
+    rsvg_handle_get_position_sub,
+    rsvg_handle_has_sub,
+    rsvg_handle_internal_set_testing,
+    rsvg_handle_new_from_data,
+    rsvg_handle_new_from_file,
+    rsvg_handle_new_from_gfile_sync,
+    rsvg_handle_new_from_stream_sync,
+    rsvg_handle_new_with_flags,
+    rsvg_handle_read_stream_sync,
+    rsvg_handle_render_cairo_sub,
+    rsvg_handle_render_element,
+    rsvg_handle_render_document,
+    rsvg_handle_render_layer,
+    rsvg_handle_set_base_gfile,
+    rsvg_handle_set_base_uri,
+    rsvg_handle_set_dpi_x_y,
+    rsvg_handle_set_size_callback,
+    rsvg_handle_write,
+};
+
+pub use dpi::{rsvg_set_default_dpi, rsvg_set_default_dpi_x_y};
+
+#[rustfmt::skip]
+pub use pixbuf_utils::{
+    rsvg_pixbuf_from_file,
+    rsvg_pixbuf_from_file_at_max_size,
+    rsvg_pixbuf_from_file_at_size,
+    rsvg_pixbuf_from_file_at_zoom,
+    rsvg_pixbuf_from_file_at_zoom_with_max,
+};
+
+#[macro_use]
+mod messages;
+
+mod dpi;
+pub mod handle;
+pub mod pixbuf_utils;
+pub mod sizing;
diff --git a/librsvg-c/src/c_api/messages.rs b/librsvg-c/src/messages.rs
index 5b227cb8..5b227cb8 100644
--- a/librsvg-c/src/c_api/messages.rs
+++ b/librsvg-c/src/messages.rs
diff --git a/librsvg-c/src/c_api/pixbuf_utils.rs b/librsvg-c/src/pixbuf_utils.rs
index da1ad804..da1ad804 100644
--- a/librsvg-c/src/c_api/pixbuf_utils.rs
+++ b/librsvg-c/src/pixbuf_utils.rs
diff --git a/librsvg-c/src/c_api/sizing.rs b/librsvg-c/src/sizing.rs
index 4d16e483..4d16e483 100644
--- a/librsvg-c/src/c_api/sizing.rs
+++ b/librsvg-c/src/sizing.rs
diff --git a/librsvg-c/tests/legacy_sizing.rs b/librsvg-c/tests/legacy_sizing.rs
index 3ccc1f01..e47859f4 100644
--- a/librsvg-c/tests/legacy_sizing.rs
+++ b/librsvg-c/tests/legacy_sizing.rs
@@ -1,6 +1,6 @@
 use cairo;
 
-use librsvg_c::c_api::sizing::LegacySize;
+use librsvg_c::sizing::LegacySize;
 use rsvg::test_utils::load_svg;
 use rsvg::CairoRenderer;