[librsvg: 6/33] Rename rsvg_internals -> librsvg throughout
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 6/33] Rename rsvg_internals -> librsvg throughout
- Date: Mon, 2 Nov 2020 16:59:47 +0000 (UTC)
commit 6ef8ea45f697a0c8b77dc9943fd67645477e7708
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Oct 29 14:54:25 2020 -0600
Rename rsvg_internals -> librsvg throughout
src/api.rs | 14 +++++++++-----
src/aspect_ratio.rs | 4 ++--
src/error.rs | 6 +++---
src/href.rs | 2 +-
src/length.rs | 14 +++++++-------
src/lib.rs | 18 +++++-------------
src/parsers.rs | 2 +-
7 files changed, 28 insertions(+), 32 deletions(-)
---
diff --git a/src/api.rs b/src/api.rs
index aff83cdd..81037568 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -150,6 +150,11 @@
#![warn(missing_docs)]
#![deny(warnings)]
+pub use crate::{
+ error::{DefsLookupErrorKind, HrefError, LoadingError, RenderingError},
+ length::{LengthUnit, RsvgLength as Length},
+};
+
use glib::prelude::*;
use url::Url;
@@ -157,13 +162,12 @@ use std::path::Path;
use gio::{Cancellable, FileExt};
-pub use rsvg_internals::{
- DefsLookupErrorKind, Dpi, Handle, HrefError, LengthUnit, LoadOptions, LoadingError,
- RenderingError, RsvgLength as Length,
+use crate::{
+ dpi::Dpi,
+ handle::{Handle, LoadOptions},
+ url_resolver::UrlResolver,
};
-use rsvg_internals::UrlResolver;
-
/// Builder for loading an [`SvgHandle`][SvgHandle].
///
/// This is the starting point for using librsvg. This struct
diff --git a/src/aspect_ratio.rs b/src/aspect_ratio.rs
index 93c0b807..a9ffa087 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 rsvg_internals::doctest_only::AspectRatio;
-//! # use crate::rsvg_internals::Parse;
+//! # use librsvg::doctest_only::AspectRatio;
+//! # use librsvg::doctest_only::Parse;
//! assert_eq!(
//! AspectRatio::parse_str("xMidYMid"),
//! Ok(AspectRatio::default())
diff --git a/src/error.rs b/src/error.rs
index 839bd37e..2a6a5521 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -207,9 +207,9 @@ impl fmt::Display for AcquireError {
/// `set_atts()` methods as follows:
///
/// ```
-/// # use rsvg_internals::doctest_only::AttributeResultExt;
-/// # use rsvg_internals::doctest_only::ValueErrorKind;
-/// # use rsvg_internals::doctest_only::ElementError;
+/// # use librsvg::doctest_only::AttributeResultExt;
+/// # use librsvg::doctest_only::ValueErrorKind;
+/// # use librsvg::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 de090643..7d3dfe48 100644
--- a/src/href.rs
+++ b/src/href.rs
@@ -18,7 +18,7 @@ use markup5ever::{expanded_name, local_name, namespace_url, ns, ExpandedName};
/// ```
/// # #[macro_use] extern crate markup5ever;
/// # use markup5ever::{QualName, Prefix, Namespace, LocalName, ExpandedName};
-/// # use rsvg_internals::doctest_only::{is_href,set_href};
+/// # use librsvg::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 317ad521..f9b59d15 100644
--- a/src/length.rs
+++ b/src/length.rs
@@ -13,7 +13,7 @@
//! `(center_x, center_y, radius)`:
//!
//! ```
-//! # use rsvg_internals::doctest_only::{Length,Horizontal,Vertical,Both};
+//! # use librsvg::doctest_only::{Length,Horizontal,Vertical,Both};
//! pub struct Circle {
//! cx: Length<Horizontal>,
//! cy: Length<Vertical>,
@@ -174,8 +174,8 @@ impl Normalize for Both {
/// Examples of construction:
///
/// ```
-/// # use rsvg_internals::doctest_only::{Length,LengthUnit,Horizontal,Vertical,Both};
-/// # use crate::rsvg_internals::Parse;
+/// # use librsvg::doctest_only::{Length,LengthUnit,Horizontal,Vertical,Both};
+/// # use librsvg::doctest_only::Parse;
/// // Explicit type
/// let width: Length<Horizontal> = Length::new(42.0, LengthUnit::Cm);
///
@@ -280,7 +280,7 @@ impl<N: Normalize> Length<N> {
/// orientation. You can specify it explicitly, or call the parametrized method:
///
/// ```
- /// # use rsvg_internals::doctest_only::{Length,LengthUnit,Horizontal,Vertical};
+ /// # use librsvg::doctest_only::{Length,LengthUnit,Horizontal,Vertical};
/// // Explicit type
/// let width: Length<Horizontal> = Length::new(42.0, LengthUnit::Cm);
///
@@ -300,9 +300,9 @@ impl<N: Normalize> Length<N> {
/// This is usually used right after parsing a length value, as part of a validation step:
///
/// ```
- /// # use rsvg_internals::doctest_only::{Length,Horizontal,LengthUnit};
- /// # use rsvg_internals::doctest_only::ElementError;
- /// # use rsvg_internals::doctest_only::ParseValue;
+ /// # use librsvg::doctest_only::{Length,Horizontal,LengthUnit};
+ /// # use librsvg::doctest_only::ElementError;
+ /// # use librsvg::doctest_only::ParseValue;
/// # use markup5ever::{QualName, Prefix, Namespace, LocalName};
/// # let attr = QualName::new(
/// # Some(Prefix::from("")),
diff --git a/src/lib.rs b/src/lib.rs
index 07b36599..290d361a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,24 +58,15 @@
#![allow(clippy::too_many_arguments)]
#![warn(unused)]
-pub use crate::color::Color;
-
-pub use crate::dpi::Dpi;
-
-pub use crate::error::{DefsLookupErrorKind, HrefError, LoadingError, RenderingError};
-
-pub use crate::handle::{Handle, LoadOptions};
+// The public API is exported here
+pub use crate::api::*;
-pub use crate::length::{Length, LengthUnit, RsvgLength};
+pub use crate::color::Color;
pub use crate::parsers::Parse;
pub use crate::rect::{IRect, Rect};
-pub use crate::structure::IntrinsicDimensions;
-
-pub use crate::url_resolver::UrlResolver;
-
#[macro_use]
pub mod log;
@@ -94,6 +85,7 @@ mod node;
#[macro_use]
mod property_macros;
+mod api;
mod angle;
mod aspect_ratio;
mod attributes;
@@ -152,5 +144,5 @@ pub mod doctest_only {
pub use crate::href::is_href;
pub use crate::href::set_href;
pub use crate::length::{Both, Horizontal, Length, LengthUnit, Vertical};
- pub use crate::parsers::ParseValue;
+ pub use crate::parsers::{ParseValue, Parse};
}
diff --git a/src/parsers.rs b/src/parsers.rs
index 840c5655..4cf94843 100644
--- a/src/parsers.rs
+++ b/src/parsers.rs
@@ -124,7 +124,7 @@ impl Parse for i32 {
/// # Example
///
/// ```
-/// # #[macro_use] extern crate rsvg_internals;
+/// # #[macro_use] extern crate librsvg;
/// # use cssparser::{ParserInput, Parser};
/// # fn main() -> Result<(), cssparser::BasicParseError<'static>> {
/// # let mut input = ParserInput::new("true");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]