(#644): Rename Rust crate to "rsvg"

This is more in line with the conventions for Rust crate names,
instead of "librsvg".  Thanks to Stefan Lau for ceding the name, which
was previously used by the rsvg-rs bindings before librsvg itself
provided a Rust API.

Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/644

39 files changed, 76 insertions, 76 deletions

diff --git a/Cargo.toml b/Cargo.toml
index e0be67e5..7c08b330 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ freetype2 = "20.0.14"
 libxml2 = { name = "libxml-2.0", version = "2.9" }
 
 [lib]
-name = "librsvg"
+name = "rsvg"
 crate-type = [ "staticlib", "rlib" ]
 
 [dependencies]
diff --git a/Makefile.am b/Makefile.am
index 24e47b34..1c88241e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,7 +154,7 @@ cargo_verbose_1 = --verbose
 LIBRSVG_BUILD_DIR=@abs_top_builddir@
 CARGO_TARGET_DIR=$(LIBRSVG_BUILD_DIR)/target
 
-RUST_LIB=$(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/liblibrsvg.a
+RUST_LIB=$(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/librsvg.a
 
 check-local:
 	cd $(srcdir) &&					\
diff --git a/benches/box_blur.rs b/benches/box_blur.rs
index c60040d1..876449ad 100644
--- a/benches/box_blur.rs
+++ b/benches/box_blur.rs
@@ -1,6 +1,6 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 
-use librsvg::{
+use rsvg::{
     surface_utils::shared_surface::{
         AlphaOnly, Horizontal, NotAlphaOnly, SharedImageSurface, SurfaceType, Vertical,
     },
diff --git a/benches/composite.rs b/benches/composite.rs
index d4fe7846..64e27003 100644
--- a/benches/composite.rs
+++ b/benches/composite.rs
@@ -1,6 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use librsvg::{
+use rsvg::{
     surface_utils::shared_surface::{
         composite_arithmetic, ExclusiveImageSurface, SharedImageSurface, SurfaceType,
     },
diff --git a/benches/lighting.rs b/benches/lighting.rs
index 47251fa2..3d43815a 100644
--- a/benches/lighting.rs
+++ b/benches/lighting.rs
@@ -1,7 +1,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use nalgebra::{Matrix3, Vector2};
 
-use librsvg::{
+use rsvg::{
     filters::lighting::Normal,
     surface_utils::{
         iterators::{PixelRectangle, Pixels},
diff --git a/benches/path_parser.rs b/benches/path_parser.rs
index fe9602d5..1c0c29ec 100644
--- a/benches/path_parser.rs
+++ b/benches/path_parser.rs
@@ -1,7 +1,7 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use librsvg::bench_only::Lexer;
-use librsvg::bench_only::PathBuilder;
+use rsvg::bench_only::Lexer;
+use rsvg::bench_only::PathBuilder;
 
 static INPUT: &'static str = "M10 20 C 30,40 50 60-70,80,90 100,110 120,130,140";
 
diff --git a/benches/pixbuf_from_surface.rs b/benches/pixbuf_from_surface.rs
index b88ac612..9b88a9df 100644
--- a/benches/pixbuf_from_surface.rs
+++ b/benches/pixbuf_from_surface.rs
@@ -1,6 +1,6 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
-use librsvg::{
+use rsvg::{
     surface_utils::{
         shared_surface::{ExclusiveImageSurface, SurfaceType},
         ImageSurfaceDataExt, Pixel,
diff --git a/benches/pixel_iterators.rs b/benches/pixel_iterators.rs
index 031e3a75..fbcab5b6 100644
--- a/benches/pixel_iterators.rs
+++ b/benches/pixel_iterators.rs
@@ -1,6 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use librsvg::{
+use rsvg::{
     surface_utils::{
         iterators::Pixels,
         shared_surface::{ExclusiveImageSurface, SharedImageSurface, SurfaceType},
diff --git a/benches/pixel_ops.rs b/benches/pixel_ops.rs
index dfe19dc0..4b5b00c5 100644
--- a/benches/pixel_ops.rs
+++ b/benches/pixel_ops.rs
@@ -1,6 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use librsvg::surface_utils::{Pixel, PixelOps};
+use rsvg::surface_utils::{Pixel, PixelOps};
 
 const OTHER: Pixel = Pixel {
     r: 0x10,
diff --git a/benches/srgb.rs b/benches/srgb.rs
index 2298f9a5..bccfed8a 100644
--- a/benches/srgb.rs
+++ b/benches/srgb.rs
@@ -1,6 +1,6 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-use librsvg::{
+use rsvg::{
     surface_utils::{
         shared_surface::{ExclusiveImageSurface, SurfaceType},
         srgb::{linearize, map_unpremultiplied_components_loop},
diff --git a/benches/surface_from_pixbuf.rs b/benches/surface_from_pixbuf.rs
index 906e93af..529ddc52 100644
--- a/benches/surface_from_pixbuf.rs
+++ b/benches/surface_from_pixbuf.rs
@@ -1,7 +1,7 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use gdk_pixbuf::{Colorspace, Pixbuf};
 
-use librsvg::surface_utils::shared_surface::SharedImageSurface;
+use rsvg::surface_utils::shared_surface::SharedImageSurface;
 
 fn bench_surface_from_pixbuf(c: &mut Criterion) {
     let mut group = c.benchmark_group("surface_from_pixbuf");
diff --git a/examples/proportional.rs b/examples/proportional.rs
index aefc5df9..4c992994 100644
--- a/examples/proportional.rs
+++ b/examples/proportional.rs
@@ -1,5 +1,5 @@
 use cairo;
-use librsvg;
+use rsvg;
 
 use std::fs::File;
 use std::io::BufWriter;
@@ -28,7 +28,7 @@ fn main() {
 
     assert!(width > 0 && height > 0);
 
-    let handle = match librsvg::Loader::new().read_path(input) {
+    let handle = match rsvg::Loader::new().read_path(input) {
         Ok(handle) => handle,
 
         Err(e) => {
@@ -37,7 +37,7 @@ fn main() {
         }
     };
 
-    let renderer = librsvg::CairoRenderer::new(&handle);
+    let renderer = rsvg::CairoRenderer::new(&handle);
 
     let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, width, height).unwrap();
     let cr = cairo::Context::new(&surface).expect("Failed to create a cairo context");
diff --git a/gdk-pixbuf-loader/src/lib.rs b/gdk-pixbuf-loader/src/lib.rs
index 53e96e18..007367c1 100644
--- a/gdk-pixbuf-loader/src/lib.rs
+++ b/gdk-pixbuf-loader/src/lib.rs
@@ -16,8 +16,8 @@ use gio::prelude::MemoryInputStreamExt;
 use gio::MemoryInputStream;
 use glib::gobject_ffi::GObject;
 
-use librsvg::rsvg_convert_only::LegacySize;
-use librsvg::Loader;
+use rsvg::rsvg_convert_only::LegacySize;
+use rsvg::Loader;
 
 use cstr::cstr;
 
@@ -83,7 +83,7 @@ unsafe extern "C" fn stop_load(user_data: gpointer, error: *mut *mut GError) ->
             .read_stream::<_, gio::File, gio::Cancellable>(&ctx.stream, None, None)
             .map_err(|e| e.to_string())?;
 
-        let renderer = librsvg::CairoRenderer::new(&handle);
+        let renderer = rsvg::CairoRenderer::new(&handle);
         let (w, h) = renderer.legacy_document_size().map_err(|e| e.to_string())?;
         let mut w = w.ceil() as c_int;
         let mut h = h.ceil() as c_int;
@@ -104,7 +104,7 @@ unsafe extern "C" fn stop_load(user_data: gpointer, error: *mut *mut GError) ->
             }
         }
 
-        let pb = librsvg::c_api::pixbuf_utils::render_to_pixbuf_at_size(
+        let pb = rsvg::c_api::pixbuf_utils::render_to_pixbuf_at_size(
             &renderer, w as f64, h as f64, w as f64, h as f64,
         )
         .map_err(|e| e.to_string())?;
diff --git a/src/api.rs b/src/api.rs
index 54e580fa..beaee9a9 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -56,9 +56,9 @@ impl Loader {
     /// # Example:
     ///
     /// ```
-    /// use librsvg;
+    /// use rsvg;
     ///
-    /// let svg_handle = librsvg::Loader::new()
+    /// let svg_handle = rsvg::Loader::new()
     ///     .read_path("example.svg")
     ///     .unwrap();
     /// ```
@@ -90,9 +90,9 @@ impl Loader {
     ///
     /// # Example:
     /// ```
-    /// use librsvg;
+    /// use rsvg;
     ///
-    /// let svg_handle = librsvg::Loader::new()
+    /// let svg_handle = rsvg::Loader::new()
     ///     .with_unlimited_size(true)
     ///     .read_path("example.svg")    // presumably a trusted huge file
     ///     .unwrap();
@@ -118,7 +118,7 @@ impl Loader {
     ///
     /// ```
     /// # use std::env;
-    /// let svg_handle = librsvg::Loader::new()
+    /// let svg_handle = rsvg::Loader::new()
     ///     .keep_image_data(true)
     ///     .read_path("example.svg")
     ///     .unwrap();
@@ -128,12 +128,12 @@ impl Loader {
     /// let surface = cairo::PdfSurface::new(640.0, 480.0, output)?;
     /// let cr = cairo::Context::new(&surface).expect("Failed to create a cairo context");
     ///
-    /// let renderer = librsvg::CairoRenderer::new(&svg_handle);
+    /// let renderer = rsvg::CairoRenderer::new(&svg_handle);
     /// renderer.render_document(
     ///     &cr,
     ///     &cairo::Rectangle::new(0.0, 0.0, 640.0, 480.0),
     /// )?;
-    /// # Ok::<(), librsvg::RenderingError>(())
+    /// # Ok::<(), rsvg::RenderingError>(())
     /// ```
     pub fn keep_image_data(mut self, keep: bool) -> Self {
         self.keep_image_data = keep;
@@ -145,7 +145,7 @@ impl Loader {
     /// # Example:
     ///
     /// ```
-    /// let svg_handle = librsvg::Loader::new()
+    /// let svg_handle = rsvg::Loader::new()
     ///     .read_path("example.svg")
     ///     .unwrap();
     /// ```
@@ -160,7 +160,7 @@ impl Loader {
     ///
     /// # Example:
     /// ```
-    /// let svg_handle = librsvg::Loader::new()
+    /// let svg_handle = rsvg::Loader::new()
     ///     .read_file(&gio::File::for_path("example.svg"), None::<&gio::Cancellable>)
     ///     .unwrap();
     /// ```
@@ -194,7 +194,7 @@ impl Loader {
     ///
     /// let stream = file.read(None::<&gio::Cancellable>).unwrap();
     ///
-    /// let svg_handle = librsvg::Loader::new()
+    /// let svg_handle = rsvg::Loader::new()
     ///     .read_stream(&stream, Some(&file), None::<&gio::Cancellable>)
     ///     .unwrap();
     /// ```
diff --git a/src/aspect_ratio.rs b/src/aspect_ratio.rs
index 42d6c76f..3b2cc830 100644
--- a/src/aspect_ratio.rs
+++ b/src/aspect_ratio.rs
@@ -4,8 +4,8 @@
 //! We have an [`AspectRatio`] struct which encapsulates such a value.
 //!
 //! ```
-//! # use librsvg::doctest_only::AspectRatio;
-//! # use librsvg::doctest_only::Parse;
+//! # use rsvg::doctest_only::AspectRatio;
+//! # use rsvg::doctest_only::Parse;
 //! assert_eq!(
 //!     AspectRatio::parse_str("xMidYMid").unwrap(),
 //!     AspectRatio::default()
diff --git a/src/bin/rsvg-bench.rs b/src/bin/rsvg-bench.rs
index f92c8991..fc810971 100644
--- a/src/bin/rsvg-bench.rs
+++ b/src/bin/rsvg-bench.rs
@@ -33,7 +33,7 @@ struct Opt {
 #[derive(Debug)]
 enum LoadingError {
     Skipped,
-    Rsvg(librsvg::LoadingError),
+    Rsvg(rsvg::LoadingError),
 }
 
 #[derive(Debug, Error)]
@@ -51,8 +51,8 @@ impl From<cairo::Error> for ProcessingError {
     }
 }
 
-impl From<librsvg::RenderingError> for ProcessingError {
-    fn from(_: librsvg::RenderingError) -> ProcessingError {
+impl From<rsvg::RenderingError> for ProcessingError {
+    fn from(_: rsvg::RenderingError) -> ProcessingError {
         ProcessingError::RenderingError
     }
 }
@@ -82,8 +82,8 @@ fn process_directory<P: AsRef<Path>>(opt: &Opt, path: P) -> Result<()> {
     Ok(())
 }
 
-fn read_svg(opt: &Opt, path: &Path) -> Result<librsvg::SvgHandle, LoadingError> {
-    match (opt.hard_failures, librsvg::Loader::new().read_path(path)) {
+fn read_svg(opt: &Opt, path: &Path) -> Result<rsvg::SvgHandle, LoadingError> {
+    match (opt.hard_failures, rsvg::Loader::new().read_path(path)) {
         (_, Ok(h)) => Ok(h),
         (false, Err(e)) => {
             println!(
@@ -125,8 +125,8 @@ fn process_file<P: AsRef<Path>>(opt: &Opt, path: P) -> Result<()> {
     Ok(())
 }
 
-fn render_to_cairo(opt: &Opt, handle: &librsvg::SvgHandle) -> Result<(), ProcessingError> {
-    let renderer = librsvg::CairoRenderer::new(handle);
+fn render_to_cairo(opt: &Opt, handle: &rsvg::SvgHandle) -> Result<(), ProcessingError> {
+    let renderer = rsvg::CairoRenderer::new(handle);
 
     let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, 100, 100)?;
     let cr = cairo::Context::new(&surface)?;
diff --git a/src/bin/rsvg-convert.rs b/src/bin/rsvg-convert.rs
index 70d32747..9c472331 100644
--- a/src/bin/rsvg-convert.rs
+++ b/src/bin/rsvg-convert.rs
@@ -21,11 +21,11 @@ use self::windows_imports::*;
 
 use cssparser::{_cssparser_internal_to_lowercase, match_ignore_ascii_case};
 
-use librsvg::rsvg_convert_only::{
+use rsvg::rsvg_convert_only::{
     AspectRatio, CssLength, Dpi, Horizontal, LegacySize, Length, Normalize, NormalizeParams, Parse,
     PathOrUrl, Rect, Signed, ULength, Unsigned, Validate, Vertical, ViewBox,
 };
-use librsvg::{AcceptLanguage, CairoRenderer, Color, Language, LengthUnit, Loader, RenderingError};
+use rsvg::{AcceptLanguage, CairoRenderer, Color, Language, LengthUnit, Loader, RenderingError};
 
 use std::ffi::OsString;
 use std::io;
diff --git a/src/error.rs b/src/error.rs
index 5d5cabc3..ffa1e690 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -244,9 +244,9 @@ impl fmt::Display for AcquireError {
 /// `set_atts()` methods as follows:
 ///
 /// ```
-/// # use librsvg::doctest_only::AttributeResultExt;
-/// # use librsvg::doctest_only::ValueErrorKind;
-/// # use librsvg::doctest_only::ElementError;
+/// # use rsvg::doctest_only::AttributeResultExt;
+/// # use rsvg::doctest_only::ValueErrorKind;
+/// # use rsvg::doctest_only::ElementError;
 /// # use markup5ever::{QualName, Prefix, Namespace, LocalName};
 /// # type FooError = ValueErrorKind;
 /// fn parse_foo(value: &str) -> Result<(), FooError>
diff --git a/src/href.rs b/src/href.rs
index 94b05913..b2626221 100644
--- a/src/href.rs
+++ b/src/href.rs
@@ -17,7 +17,7 @@ use markup5ever::{expanded_name, local_name, namespace_url, ns, ExpandedName};
 ///
 /// ```
 /// # use markup5ever::{expanded_name, local_name, namespace_url, ns, QualName, Prefix, Namespace, LocalName, ExpandedName};
-/// # use librsvg::doctest_only::{is_href,set_href};
+/// # use rsvg::doctest_only::{is_href,set_href};
 ///
 /// let qual_name = QualName::new(
 ///     Some(Prefix::from("xlink")),
diff --git a/src/length.rs b/src/length.rs
index 2f2d57f9..50d6addf 100644
--- a/src/length.rs
+++ b/src/length.rs
@@ -18,7 +18,7 @@
 //! structure with fields for the `(center_x, center_y, radius)`:
 //!
 //! ```
-//! # use librsvg::doctest_only::{Length,ULength,Horizontal,Vertical,Both};
+//! # use rsvg::doctest_only::{Length,ULength,Horizontal,Vertical,Both};
 //! pub struct Circle {
 //!     cx: Length<Horizontal>,
 //!     cy: Length<Vertical>,
@@ -205,8 +205,8 @@ impl Validate for Unsigned {
 /// Examples of construction:
 ///
 /// ```
-/// # use librsvg::doctest_only::{Length,ULength,LengthUnit,Horizontal,Vertical,Both};
-/// # use librsvg::doctest_only::Parse;
+/// # use rsvg::doctest_only::{Length,ULength,LengthUnit,Horizontal,Vertical,Both};
+/// # use rsvg::doctest_only::Parse;
 /// // Explicit type
 /// let width: Length<Horizontal> = Length::new(42.0, LengthUnit::Cm);
 ///
@@ -341,7 +341,7 @@ impl<N: Normalize, V: Validate> CssLength<N, V> {
     /// You can specify them explicitly, or call the parametrized method:
     ///
     /// ```
-    /// # use librsvg::doctest_only::{Length,LengthUnit,Horizontal,Vertical};
+    /// # use rsvg::doctest_only::{Length,LengthUnit,Horizontal,Vertical};
     /// // Explicit type
     /// let width: Length<Horizontal> = Length::new(42.0, LengthUnit::Cm);
     ///
diff --git a/src/lib.rs b/src/lib.rs
index 022c0150..345c559e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! librsvg = { git="https://gitlab.gnome.org/GNOME/librsvg" }
+//! rsvg = { git="https://gitlab.gnome.org/GNOME/librsvg" }
 //! cairo-rs = "0.8.0"
 //! glib = "0.9.0"                                # only if you need streams
 //! gio = { version="0.8.1", features=["v2_50"] } # likewise
@@ -36,12 +36,12 @@
 //! fn main() {
 //!     // Loading from a file
 //!
-//!     let handle = librsvg::Loader::new().read_path("example.svg").unwrap();
+//!     let handle = rsvg::Loader::new().read_path("example.svg").unwrap();
 //!
 //!     let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, WIDTH, HEIGHT).unwrap();
 //!     let cr = cairo::Context::new(&surface).expect("Failed to create a cairo context");
 //!
-//!     let renderer = librsvg::CairoRenderer::new(&handle);
+//!     let renderer = rsvg::CairoRenderer::new(&handle);
 //!     renderer.render_document(
 //!         &cr,
 //!         &cairo::Rectangle::new(0.0, 0.0, f64::from(WIDTH), f64::from(HEIGHT))
@@ -58,7 +58,7 @@
 //!     );
 //!     let stream = gio::MemoryInputStream::from_bytes(&bytes);
 //!
-//!     let handle = librsvg::Loader::new().read_stream(
+//!     let handle = rsvg::Loader::new().read_stream(
 //!         &stream,
 //!         None::<&gio::File>,          // no base file as this document has no references
 //!         None::<&gio::Cancellable>,   // no cancellable
diff --git a/src/parsers.rs b/src/parsers.rs
index d6b82637..7dd3e441 100644
--- a/src/parsers.rs
+++ b/src/parsers.rs
@@ -190,7 +190,7 @@ impl<const REQUIRED: usize, const MAX: usize> Parse for NumberList<REQUIRED, MAX
 ///
 /// ```
 /// # use cssparser::{ParserInput, Parser};
-/// # use librsvg::parse_identifiers;
+/// # use rsvg::parse_identifiers;
 /// # fn main() -> Result<(), cssparser::BasicParseError<'static>> {
 /// # let mut input = ParserInput::new("true");
 /// # let mut parser = Parser::new(&mut input);
diff --git a/tests/src/api.rs b/tests/src/api.rs
index e4809696..7846b2cb 100644
--- a/tests/src/api.rs
+++ b/tests/src/api.rs
@@ -1,6 +1,6 @@
 use cairo;
-use librsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
-use librsvg::{CairoRenderer, RenderingError};
+use rsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+use rsvg::{CairoRenderer, RenderingError};
 
 use crate::reference_utils::{Compare, Evaluate, Reference};
 use crate::utils::load_svg;
diff --git a/tests/src/bugs.rs b/tests/src/bugs.rs
index b5d5ae1e..6fb75f7c 100644
--- a/tests/src/bugs.rs
+++ b/tests/src/bugs.rs
@@ -1,6 +1,6 @@
 use cairo;
-use librsvg::{CairoRenderer, Loader, LoadingError, SvgHandle};
 use matches::matches;
+use rsvg::{CairoRenderer, Loader, LoadingError, SvgHandle};
 
 use crate::reference_utils::{Compare, Evaluate, Reference};
 use crate::utils::{load_svg, render_document, setup_font_map, setup_language, SurfaceSize};
diff --git a/tests/src/cmdline/rsvg_convert.rs b/tests/src/cmdline/rsvg_convert.rs
index 00e89947..88e63ce8 100644
--- a/tests/src/cmdline/rsvg_convert.rs
+++ b/tests/src/cmdline/rsvg_convert.rs
@@ -5,10 +5,10 @@ use assert_cmd::assert::IntoOutputPredicate;
 use assert_cmd::Command;
 #[cfg(system_deps_have_cairo_pdf)]
 use chrono::{TimeZone, Utc};
-use librsvg::{Length, LengthUnit};
 use predicates::boolean::*;
 use predicates::prelude::*;
 use predicates::str::*;
+use rsvg::{Length, LengthUnit};
 use std::path::Path;
 use tempfile::Builder;
 use url::Url;
diff --git a/tests/src/compare_surfaces.rs b/tests/src/compare_surfaces.rs
index 4b7032ae..0a170441 100644
--- a/tests/src/compare_surfaces.rs
+++ b/tests/src/compare_surfaces.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use librsvg::surface_utils::{
+use rsvg::surface_utils::{
     iterators::Pixels,
     shared_surface::{SharedImageSurface, SurfaceType},
     ImageSurfaceDataExt, Pixel, PixelOps,
diff --git a/tests/src/errors.rs b/tests/src/errors.rs
index 5113d623..e6386611 100644
--- a/tests/src/errors.rs
+++ b/tests/src/errors.rs
@@ -11,7 +11,7 @@
 #![cfg(test)]
 
 use cairo;
-use librsvg::{CairoRenderer, ImplementationLimit, Loader, LoadingError, RenderingError};
+use rsvg::{CairoRenderer, ImplementationLimit, Loader, LoadingError, RenderingError};
 
 #[ignore]
 #[test]
diff --git a/tests/src/geometries.rs b/tests/src/geometries.rs
index db1d2cc1..c62f1eeb 100644
--- a/tests/src/geometries.rs
+++ b/tests/src/geometries.rs
@@ -13,7 +13,7 @@
 //! time.
 
 use anyhow::{Context, Result};
-use librsvg::{CairoRenderer, LengthUnit, Loader, Rect};
+use rsvg::{CairoRenderer, LengthUnit, Loader, Rect};
 use serde::Deserialize;
 use std::collections::BTreeMap;
 use std::fs;
diff --git a/tests/src/intrinsic_dimensions.rs b/tests/src/intrinsic_dimensions.rs
index e7ab4954..4ca31f93 100644
--- a/tests/src/intrinsic_dimensions.rs
+++ b/tests/src/intrinsic_dimensions.rs
@@ -1,6 +1,6 @@
 use cairo;
 
-use librsvg::{CairoRenderer, IntrinsicDimensions, Length, LengthUnit, RenderingError};
+use rsvg::{CairoRenderer, IntrinsicDimensions, Length, LengthUnit, RenderingError};
 
 use crate::reference_utils::{Compare, Evaluate, Reference};
 use crate::utils::{load_svg, render_document, SurfaceSize};
diff --git a/tests/src/legacy_sizing.rs b/tests/src/legacy_sizing.rs
index dd1474fd..78f2a13f 100644
--- a/tests/src/legacy_sizing.rs
+++ b/tests/src/legacy_sizing.rs
@@ -1,6 +1,6 @@
 use cairo;
 
-use librsvg::{rsvg_convert_only::LegacySize, CairoRenderer};
+use rsvg::{rsvg_convert_only::LegacySize, CairoRenderer};
 
 use crate::utils::load_svg;
 
diff --git a/tests/src/loading_crash.rs b/tests/src/loading_crash.rs
index e23e1d10..1db3e579 100644
--- a/tests/src/loading_crash.rs
+++ b/tests/src/loading_crash.rs
@@ -3,7 +3,7 @@
 //! Ensures that loading and parsing (but not rendering) a particular
 //! SVG doesn't crash.
 
-use librsvg::Loader;
+use rsvg::Loader;
 
 use std::path::PathBuf;
 
diff --git a/tests/src/predicates/png.rs b/tests/src/predicates/png.rs
index c3cca96f..452e756e 100644
--- a/tests/src/predicates/png.rs
+++ b/tests/src/predicates/png.rs
@@ -5,7 +5,7 @@ use std::fmt;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 
-use librsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+use rsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
 
 use crate::compare_surfaces::BufferDiff;
 use crate::reference_utils::{surface_from_png, Compare, Deviation, Reference};
diff --git a/tests/src/predicates/svg.rs b/tests/src/predicates/svg.rs
index 81decb4e..cd6071b7 100644
--- a/tests/src/predicates/svg.rs
+++ b/tests/src/predicates/svg.rs
@@ -6,7 +6,7 @@ use predicates::reflection::{Case, Child, PredicateReflection, Product};
 use std::cmp;
 use std::fmt;
 
-use librsvg::{CairoRenderer, Length, Loader, LoadingError, SvgHandle};
+use rsvg::{CairoRenderer, Length, Loader, LoadingError, SvgHandle};
 
 /// Checks that the variable of type [u8] can be parsed as a SVG file.
 #[derive(Debug)]
diff --git a/tests/src/primitive_geometries.rs b/tests/src/primitive_geometries.rs
index 3a9f2391..479d6445 100644
--- a/tests/src/primitive_geometries.rs
+++ b/tests/src/primitive_geometries.rs
@@ -28,7 +28,7 @@
 
 use anyhow::{Context, Result};
 use cairo;
-use librsvg::{CairoRenderer, LengthUnit, Loader, Rect};
+use rsvg::{CairoRenderer, LengthUnit, Loader, Rect};
 use serde::Deserialize;
 use std::collections::BTreeMap;
 use std::fs;
@@ -72,7 +72,7 @@ fn read_geometries(path: &str) -> Result<Geometries> {
 // We create a struct with the id and geometry so that
 // assert_eq!() in the tests will print out the element name for failures.
 //
-// Here we use librsvg::Rect as that one has an approx_eq() method.
+// Here we use rsvg::Rect as that one has an approx_eq() method.
 #[derive(Debug, PartialEq)]
 struct Element {
     id: String,
diff --git a/tests/src/reference.rs b/tests/src/reference.rs
index 837bf1d8..7d57fd2f 100644
--- a/tests/src/reference.rs
+++ b/tests/src/reference.rs
@@ -7,7 +7,7 @@
 //!
 
 use cairo;
-use librsvg::{
+use rsvg::{
     surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
     CairoRenderer, IntrinsicDimensions, Length, Loader,
 };
@@ -121,7 +121,7 @@ fn image_size(dim: IntrinsicDimensions, dpi: f64) -> (i32, i32) {
         vbox,
     } = dim;
 
-    use librsvg::LengthUnit::*;
+    use rsvg::LengthUnit::*;
 
     if !(has_supported_unit(&width) && has_supported_unit(&height)) {
         panic!("SVG has unsupported unit type in width or height");
@@ -161,7 +161,7 @@ fn checked_i32(x: f64) -> i32 {
 }
 
 fn has_supported_unit(l: &Length) -> bool {
-    use librsvg::LengthUnit::*;
+    use rsvg::LengthUnit::*;
 
     match l.unit {
         Percent | Px | In | Cm | Mm | Pt | Pc => true,
@@ -175,7 +175,7 @@ const MM_PER_INCH: f64 = 25.4;
 const PICA_PER_INCH: f64 = 6.0;
 
 fn normalize(l: &Length, dpi: f64) -> f64 {
-    use librsvg::LengthUnit::*;
+    use rsvg::LengthUnit::*;
 
     match l.unit {
         Px => l.length,
diff --git a/tests/src/reference_utils.rs b/tests/src/reference_utils.rs
index ecb093fe..007024d4 100644
--- a/tests/src/reference_utils.rs
+++ b/tests/src/reference_utils.rs
@@ -12,7 +12,7 @@ use std::io::{BufReader, Read};
 use std::path::{Path, PathBuf};
 use std::sync::Once;
 
-use librsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
+use rsvg::surface_utils::shared_surface::{SharedImageSurface, SurfaceType};
 
 use crate::compare_surfaces::{compare_surfaces, BufferDiff, Diff};
 
@@ -238,7 +238,7 @@ macro_rules! test_svg_reference {
             use crate::reference_utils::{Compare, Evaluate, Reference};
             use crate::utils::{render_document, setup_font_map, SurfaceSize};
             use cairo;
-            use librsvg::{CairoRenderer, Loader};
+            use rsvg::{CairoRenderer, Loader};
 
             setup_font_map();
 
diff --git a/tests/src/render_crash.rs b/tests/src/render_crash.rs
index 9a2923c9..795800ab 100644
--- a/tests/src/render_crash.rs
+++ b/tests/src/render_crash.rs
@@ -4,7 +4,7 @@
 //! about the resulting image or even whether there were errors during rendering.
 
 use cairo;
-use librsvg::{CairoRenderer, Loader};
+use rsvg::{CairoRenderer, Loader};
 
 use std::path::PathBuf;
 
diff --git a/tests/src/text.rs b/tests/src/text.rs
index 6f7c7d83..257d7f0c 100644
--- a/tests/src/text.rs
+++ b/tests/src/text.rs
@@ -1,6 +1,6 @@
 use cairo;
 use float_cmp::approx_eq;
-use librsvg::{CairoRenderer, Loader};
+use rsvg::{CairoRenderer, Loader};
 
 use crate::reference_utils::{Compare, Evaluate, Reference};
 use crate::utils::{load_svg, render_document, setup_font_map, SurfaceSize};
diff --git a/tests/src/utils.rs b/tests/src/utils.rs
index 2eb5181a..158fc77e 100644
--- a/tests/src/utils.rs
+++ b/tests/src/utils.rs
@@ -10,7 +10,7 @@ use std::env;
 use std::ffi::CString;
 use std::sync::Once;
 
-use librsvg::{
+use rsvg::{
     surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
     CairoRenderer, Loader, LoadingError, RenderingError, SvgHandle,
 };