[librsvg/alatiera/is-a-stream: 4/9] Convert a bunch of "extern crate" to "use"
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/alatiera/is-a-stream: 4/9] Convert a bunch of "extern crate" to "use"
- Date: Sun, 31 Mar 2019 18:57:40 +0000 (UTC)
commit 192e1c202e8f5c0fcb25830b54af097697885c8a
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Mar 8 15:33:38 2019 -0600
Convert a bunch of "extern crate" to "use"
librsvg_crate/Cargo.toml | 1 +
librsvg_crate/build.rs | 2 +-
librsvg_crate/examples/proportional.rs | 4 ++--
librsvg_crate/src/lib.rs | 22 +++++++++++-----------
librsvg_crate/tests/compare_surfaces.rs | 4 ++--
librsvg_crate/tests/intrinsic-dimensions.rs | 8 ++++----
librsvg_crate/tests/render_to_viewport.rs | 10 +++++-----
rsvg_internals/benches/box_blur.rs | 6 +++---
rsvg_internals/benches/composite.rs | 6 +++---
rsvg_internals/benches/lighting.rs | 8 ++++----
rsvg_internals/benches/pixel_iterators.rs | 6 +++---
rsvg_internals/benches/srgb.rs | 6 +++---
rsvg_internals/build.rs | 2 +-
rsvg_internals/src/lib.rs | 2 +-
14 files changed, 44 insertions(+), 43 deletions(-)
---
diff --git a/librsvg_crate/Cargo.toml b/librsvg_crate/Cargo.toml
index efde9869..14dea355 100644
--- a/librsvg_crate/Cargo.toml
+++ b/librsvg_crate/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.0.1"
authors = ["Federico Mena Quintero <federico gnome org>"]
workspace = "../"
build = "build.rs"
+edition = "2018"
[lib]
name = "librsvg"
diff --git a/librsvg_crate/build.rs b/librsvg_crate/build.rs
index 5dc5139e..2d3d66c7 100644
--- a/librsvg_crate/build.rs
+++ b/librsvg_crate/build.rs
@@ -1,4 +1,4 @@
-extern crate pkg_config;
+use pkg_config;
use std::env;
use std::io;
diff --git a/librsvg_crate/examples/proportional.rs b/librsvg_crate/examples/proportional.rs
index 74387ee8..abd94508 100644
--- a/librsvg_crate/examples/proportional.rs
+++ b/librsvg_crate/examples/proportional.rs
@@ -1,5 +1,5 @@
-extern crate cairo;
-extern crate librsvg;
+use cairo;
+use librsvg;
use std::fs::File;
use std::io::BufWriter;
diff --git a/librsvg_crate/src/lib.rs b/librsvg_crate/src/lib.rs
index 05191bda..3f773d04 100644
--- a/librsvg_crate/src/lib.rs
+++ b/librsvg_crate/src/lib.rs
@@ -87,10 +87,10 @@
//! [SVG 2]: https://www.w3.org/TR/SVG2/
#![warn(unused)]
-extern crate cairo;
-extern crate gio;
-extern crate glib;
-extern crate rsvg_internals;
+use cairo;
+use gio;
+use glib;
+use rsvg_internals;
use std::path::Path;
@@ -137,7 +137,7 @@ impl Loader {
/// # Example:
///
/// ```ignore
- /// extern crate librsvg;
+ /// use librsvg;
///
/// use librsvg::Loader;
///
@@ -163,7 +163,7 @@ impl Loader {
///
/// # Example:
/// ```ignore
- /// extern crate librsvg;
+ /// use librsvg;
///
/// use librsvg::Loader;
///
@@ -191,8 +191,8 @@ impl Loader {
///
/// # Example:
/// ```ignore
- /// extern crate cairo;
- /// extern crate librsvg;
+ /// use cairo;
+ /// use librsvg;
///
/// use librsvg::Loader;
///
@@ -223,7 +223,7 @@ impl Loader {
///
/// # Example:
/// ```ignore
- /// extern crate librsvg;
+ /// use librsvg;
///
/// use librsvg::Loader;
///
@@ -242,8 +242,8 @@ impl Loader {
///
/// # Example:
/// ```ignore
- /// extern crate gio;
- /// extern crate librsvg;
+ /// use gio;
+ /// use librsvg;
///
/// use librsvg::Loader;
///
diff --git a/librsvg_crate/tests/compare_surfaces.rs b/librsvg_crate/tests/compare_surfaces.rs
index dd291871..78bb3415 100644
--- a/librsvg_crate/tests/compare_surfaces.rs
+++ b/librsvg_crate/tests/compare_surfaces.rs
@@ -1,5 +1,5 @@
-extern crate cairo;
-extern crate rsvg_internals;
+use cairo;
+use rsvg_internals;
use cairo::ImageSurface;
diff --git a/librsvg_crate/tests/intrinsic-dimensions.rs b/librsvg_crate/tests/intrinsic-dimensions.rs
index a80f6b4d..f1f17ee3 100644
--- a/librsvg_crate/tests/intrinsic-dimensions.rs
+++ b/librsvg_crate/tests/intrinsic-dimensions.rs
@@ -1,7 +1,7 @@
-extern crate cairo;
-extern crate gio;
-extern crate glib;
-extern crate librsvg;
+use cairo;
+use gio;
+use glib;
+use librsvg;
use gio::MemoryInputStreamExt;
use glib::Cast;
diff --git a/librsvg_crate/tests/render_to_viewport.rs b/librsvg_crate/tests/render_to_viewport.rs
index f77d2160..2ad44e14 100644
--- a/librsvg_crate/tests/render_to_viewport.rs
+++ b/librsvg_crate/tests/render_to_viewport.rs
@@ -1,8 +1,8 @@
-extern crate cairo;
-extern crate gio;
-extern crate glib;
-extern crate librsvg;
-extern crate rsvg_internals;
+use cairo;
+use gio;
+use glib;
+use librsvg;
+use rsvg_internals;
use gio::MemoryInputStreamExt;
use glib::Cast;
diff --git a/rsvg_internals/benches/box_blur.rs b/rsvg_internals/benches/box_blur.rs
index ac7b017a..fd04d3a8 100644
--- a/rsvg_internals/benches/box_blur.rs
+++ b/rsvg_internals/benches/box_blur.rs
@@ -2,9 +2,9 @@
extern crate criterion;
use criterion::Criterion;
-extern crate cairo;
-extern crate cairo_sys;
-extern crate rsvg_internals;
+use cairo;
+use cairo_sys;
+use rsvg_internals;
use rsvg_internals::rect::IRect;
use rsvg_internals::surface_utils::shared_surface::{
diff --git a/rsvg_internals/benches/composite.rs b/rsvg_internals/benches/composite.rs
index 94d6010a..2af46ed4 100644
--- a/rsvg_internals/benches/composite.rs
+++ b/rsvg_internals/benches/composite.rs
@@ -2,9 +2,9 @@
extern crate criterion;
use criterion::{black_box, Criterion};
-extern crate cairo;
-extern crate cairo_sys;
-extern crate rsvg_internals;
+use cairo;
+use cairo_sys;
+use rsvg_internals;
use rsvg_internals::filters::composite::composite_arithmetic;
use rsvg_internals::rect::IRect;
diff --git a/rsvg_internals/benches/lighting.rs b/rsvg_internals/benches/lighting.rs
index c66ca4db..28b2e456 100644
--- a/rsvg_internals/benches/lighting.rs
+++ b/rsvg_internals/benches/lighting.rs
@@ -2,10 +2,10 @@
extern crate criterion;
use criterion::Criterion;
-extern crate cairo;
-extern crate cairo_sys;
-extern crate nalgebra;
-extern crate rsvg_internals;
+use cairo;
+use cairo_sys;
+use nalgebra;
+use rsvg_internals;
use nalgebra::{Matrix3, Vector2};
diff --git a/rsvg_internals/benches/pixel_iterators.rs b/rsvg_internals/benches/pixel_iterators.rs
index c54725e8..910c0133 100644
--- a/rsvg_internals/benches/pixel_iterators.rs
+++ b/rsvg_internals/benches/pixel_iterators.rs
@@ -2,9 +2,9 @@
extern crate criterion;
use criterion::{black_box, Criterion};
-extern crate cairo;
-extern crate cairo_sys;
-extern crate rsvg_internals;
+use cairo;
+use cairo_sys;
+use rsvg_internals;
use rsvg_internals::rect::IRect;
use rsvg_internals::surface_utils::{
diff --git a/rsvg_internals/benches/srgb.rs b/rsvg_internals/benches/srgb.rs
index 89786072..d9026eb5 100644
--- a/rsvg_internals/benches/srgb.rs
+++ b/rsvg_internals/benches/srgb.rs
@@ -2,9 +2,9 @@
extern crate criterion;
use criterion::{black_box, Criterion};
-extern crate cairo;
-extern crate cairo_sys;
-extern crate rsvg_internals;
+use cairo;
+use cairo_sys;
+use rsvg_internals;
use rsvg_internals::rect::IRect;
use rsvg_internals::srgb::{linearize, map_unpremultiplied_components_loop};
diff --git a/rsvg_internals/build.rs b/rsvg_internals/build.rs
index 5f305505..7b69b74e 100644
--- a/rsvg_internals/build.rs
+++ b/rsvg_internals/build.rs
@@ -1,4 +1,4 @@
-extern crate phf_codegen;
+use phf_codegen;
use std::env;
use std::fs::File;
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index f88a4ada..21897b24 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -121,7 +121,7 @@ mod pattern;
mod pixbuf_utils;
mod properties;
mod property_bag;
-mod rect;
+pub mod rect;
mod shapes;
mod space;
pub mod srgb;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]