Group imports and use prelude

Author: sdroege

cairo/src/context.rs

@@ -1,29 +1,17 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::font::{
-    FontExtents, FontFace, FontOptions, Glyph, ScaledFont, TextCluster, TextExtents,
-};
-use crate::matrices::Matrix;
-use crate::paths::Path;
-use crate::Rectangle;
-use crate::{
-    Antialias, Content, FillRule, FontSlant, FontWeight, LineCap, LineJoin, Operator,
-    TextClusterFlags,
-};
+use std::{ffi::CString, fmt, mem::MaybeUninit, ops, ptr, slice};
+
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
-use std::ffi::CString;
-use std::fmt;
-use std::mem::MaybeUninit;
-use std::ops;
-use std::ptr;
-use std::slice;
-
-use crate::error::Error;
-use crate::ffi::{cairo_rectangle_list_t, cairo_t};
-use crate::patterns::Pattern;
-use crate::surface::Surface;
-use crate::utils::status_to_result;
+
+use crate::{
+    ffi::{cairo_rectangle_list_t, cairo_t},
+    utils::status_to_result,
+    Antialias, Content, Error, FillRule, FontExtents, FontFace, FontOptions, FontSlant, FontWeight,
+    Glyph, LineCap, LineJoin, Matrix, Operator, Path, Pattern, Rectangle, ScaledFont, Surface,
+    TextCluster, TextClusterFlags, TextExtents,
+};
 
 pub struct RectangleList {
     ptr: *mut cairo_rectangle_list_t,
@@ -958,12 +946,11 @@ impl fmt::Display for Context {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::enums::Format;
-    use crate::image_surface::ImageSurface;
-    use crate::patterns::LinearGradient;
     use float_eq::float_eq;
 
+    use super::*;
+    use crate::{enums::Format, image_surface::ImageSurface, patterns::LinearGradient};
+
     fn create_ctx() -> Context {
         let surface = ImageSurface::create(Format::ARgb32, 10, 10).unwrap();
         Context::new(&surface).expect("Can't create a Cairo context")

cairo/src/device.rs

@@ -1,27 +1,17 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::enums::DeviceType;
-use crate::error::Error;
-use crate::utils::status_to_result;
-
-use std::fmt;
-use std::ptr;
+#[cfg(any(feature = "script", feature = "dox"))]
+use std::ffi::CString;
+#[cfg(any(feature = "script", feature = "dox"))]
+use std::path::Path;
+use std::{fmt, ptr};
 
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
 
+use crate::{utils::status_to_result, DeviceType, Error};
 #[cfg(any(feature = "script", feature = "dox"))]
-use crate::enums::Content;
-#[cfg(any(feature = "script", feature = "dox"))]
-use crate::enums::ScriptMode;
-#[cfg(any(feature = "script", feature = "dox"))]
-use crate::recording_surface::RecordingSurface;
-#[cfg(any(feature = "script", feature = "dox"))]
-use crate::surface::Surface;
-#[cfg(any(feature = "script", feature = "dox"))]
-use std::ffi::CString;
-#[cfg(any(feature = "script", feature = "dox"))]
-use std::path::Path;
+use crate::{Content, RecordingSurface, ScriptMode, Surface};
 
 #[derive(Debug)]
 #[must_use = "if unused the Device will immediately be released"]

cairo/src/enums.rs

@@ -2,11 +2,11 @@
 
 use std::fmt::{self, Debug};
 
-use crate::error::Error;
-
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
 
+use crate::Error;
+
 // Helper macro for our GValue related trait impls
 #[cfg(feature = "use_glib")]
 macro_rules! gvalue_impl {

cairo/src/error.rs

@@ -1,7 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::fmt::Debug;
-use std::io;
+use std::{fmt::Debug, io};
+
 use thiserror::Error;
 
 #[derive(Error, Debug, Clone, PartialEq, Copy, Eq)]

cairo/src/font/font_face.rs

@@ -1,22 +1,17 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-#[cfg(feature = "use_glib")]
-use glib::translate::*;
 use std::ffi::{CStr, CString};
 #[cfg(not(feature = "use_glib"))]
 use std::ptr;
 #[cfg(any(feature = "freetype", feature = "dox"))]
 use std::rc::Rc;
 
-use crate::{
-    enums::{FontSlant, FontType, FontWeight},
-    Error,
-};
+#[cfg(feature = "use_glib")]
+use glib::translate::*;
 
 #[cfg(any(feature = "freetype", feature = "dox"))]
-use crate::enums::FtSynthesize;
-
-use crate::utils::status_to_result;
+use crate::FtSynthesize;
+use crate::{utils::status_to_result, Error, FontSlant, FontType, FontWeight};
 
 #[cfg(any(feature = "freetype", feature = "dox"))]
 static FT_FACE_KEY: crate::UserDataKey<freetype::face::Face> = crate::UserDataKey::new();

cairo/src/font/font_options.rs

@@ -1,22 +1,17 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-#[cfg(feature = "use_glib")]
-use glib::translate::*;
-use std::cmp::PartialEq;
-use std::hash;
-
-#[cfg(any(feature = "v1_16", feature = "dox"))]
-use crate::font::font_face::to_optional_string;
 #[cfg(any(feature = "v1_16", feature = "dox"))]
 use std::ffi::CString;
 #[cfg(not(feature = "use_glib"))]
 use std::ptr;
+use std::{cmp::PartialEq, hash};
 
-use crate::utils::status_to_result;
-use crate::{
-    enums::{Antialias, HintMetrics, HintStyle, SubpixelOrder},
-    Error,
-};
+#[cfg(feature = "use_glib")]
+use glib::translate::*;
+
+#[cfg(any(feature = "v1_16", feature = "dox"))]
+use crate::font::font_face::to_optional_string;
+use crate::{utils::status_to_result, Antialias, Error, HintMetrics, HintStyle, SubpixelOrder};
 
 #[cfg(feature = "use_glib")]
 glib::wrapper! {

cairo/src/font/mod.rs

@@ -9,11 +9,6 @@ mod text_cluster;
 mod text_extents;
 mod user_fonts;
 
-pub use crate::enums::{
-    Antialias, FontSlant, FontType, FontWeight, HintMetrics, HintStyle, SubpixelOrder,
-    TextClusterFlags,
-};
-
 /* TODO
  Allocates an array of cairo_glyph_t's. This function is only useful in
  implementations of cairo_user_scaled_font_text_to_glyphs_func_t where the user
@@ -39,12 +34,12 @@ impl TextCluster {
     //pub fn cairo_text_cluster_free(clusters: *TextCluster);
 }
 */
-
-pub use self::font_extents::FontExtents;
-pub use self::font_face::FontFace;
-pub use self::font_options::FontOptions;
-pub use self::glyph::Glyph;
-pub use self::scaled_font::ScaledFont;
-pub use self::text_cluster::TextCluster;
-pub use self::text_extents::TextExtents;
-pub use self::user_fonts::UserFontFace;
+pub use self::{
+    font_extents::FontExtents, font_face::FontFace, font_options::FontOptions, glyph::Glyph,
+    scaled_font::ScaledFont, text_cluster::TextCluster, text_extents::TextExtents,
+    user_fonts::UserFontFace,
+};
+pub use crate::enums::{
+    Antialias, FontSlant, FontType, FontWeight, HintMetrics, HintStyle, SubpixelOrder,
+    TextClusterFlags,
+};

cairo/src/font/scaled_font.rs

@@ -1,16 +1,14 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use std::{ffi::CString, mem::MaybeUninit, ptr};
+
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
-use std::ffi::CString;
-use std::mem::MaybeUninit;
-use std::ptr;
-
-use crate::matrices::Matrix;
-use crate::utils::status_to_result;
-use crate::{enums::FontType, Error, FontExtents, Glyph, TextCluster, TextExtents};
 
-use super::{FontFace, FontOptions};
+use crate::{
+    utils::status_to_result, Error, FontExtents, FontFace, FontOptions, FontType, Glyph, Matrix,
+    TextCluster, TextExtents,
+};
 
 #[cfg(feature = "use_glib")]
 glib::wrapper! {

cairo/src/font/user_fonts.rs

@@ -1,8 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use super::{FontExtents, FontFace, ScaledFont, TextCluster, TextClusterFlags, TextExtents};
-use crate::utils::status_to_result;
-use crate::{Context, Error, Glyph};
+use crate::{utils::status_to_result, Context, Error, Glyph};
 
 type BoxInitFunc =
     Box<dyn Fn(&ScaledFont, &Context, &mut FontExtents) -> Result<(), Error> + Send + Sync>;

cairo/src/image_surface.rs

@@ -1,19 +1,17 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::convert::TryFrom;
-use std::ops::{Deref, DerefMut};
-use std::rc::Rc;
-use std::slice;
+use std::{
+    convert::TryFrom,
+    fmt,
+    ops::{Deref, DerefMut},
+    rc::Rc,
+    slice,
+};
 
-use crate::enums::{Format, SurfaceType};
-use crate::error::Error;
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
 
-use crate::surface::Surface;
-use crate::utils::status_to_result;
-use crate::BorrowError;
-use std::fmt;
+use crate::{utils::status_to_result, BorrowError, Error, Format, Surface, SurfaceType};
 
 declare_surface!(ImageSurface, SurfaceType::Image);
 
@@ -338,7 +336,8 @@ mod tests {
     #[cfg(feature = "use_glib")]
     #[test]
     fn surface_gvalues() {
-        use glib::ToValue;
+        use glib::prelude::*;
+
         let surface = ImageSurface::create(Format::ARgb32, 10, 10).unwrap();
         let value = surface.to_value();
         assert_eq!(value.get::<ImageSurface>().unwrap().width(), 10);