Merge pull request #1254 from sdroege/clippy-warnings

Fix / work around a couple of new clippy 1.75 warnings

Author: sdroege

cairo/src/lib.rs

@@ -228,8 +228,8 @@ pub use crate::{
     enums::*,
     error::{BorrowError, Error, IoError, Result},
     font::{
-        FontExtents, FontFace, FontOptions, FontSlant, FontType, FontWeight, Glyph, ScaledFont,
-        TextCluster, TextExtents, UserFontFace,
+        Antialias, FontExtents, FontFace, FontOptions, FontSlant, FontType, FontWeight, Glyph,
+        HintMetrics, HintStyle, ScaledFont, SubpixelOrder, TextCluster, TextExtents, UserFontFace,
     },
     image_surface::{ImageSurface, ImageSurfaceData, ImageSurfaceDataOwned},
     matrices::Matrix,

gdk-pixbuf/src/prelude.rs

@@ -3,9 +3,10 @@
 // rustdoc-stripper-ignore-next
 //! Traits intended for blanket imports.
 
-#[doc(hidden)]
-pub use gio::prelude::*;
 #[doc(hidden)]
 pub use glib::prelude::*;
 
+#[doc(hidden)]
+pub use gio::prelude::*;
+
 pub use crate::{auto::traits::*, pixbuf_animation::PixbufAnimationExtManual};

gdk-pixbuf/src/subclass/mod.rs

@@ -8,9 +8,10 @@ pub mod pixbuf_animation_iter;
 pub mod pixbuf_loader;
 
 pub mod prelude {
-    pub use gio::subclass::prelude::*;
     pub use glib::subclass::prelude::*;
 
+    pub use gio::subclass::prelude::*;
+
     pub use super::{
         pixbuf_animation::{PixbufAnimationImpl, PixbufAnimationImplExt},
         pixbuf_animation_iter::{PixbufAnimationIterImpl, PixbufAnimationIterImplExt},

glib-macros/tests/properties.rs

@@ -394,9 +394,9 @@ fn ext_trait() {
     let base: base::Base = glib::object::Object::builder().build();
     assert_eq!(BasePropertiesExt::overridden(&base), 42);
 
-    let foo: foo::Foo = glib::object::Object::builder().build();
-    assert_eq!(BasePropertiesExt::overridden(&foo), 43);
-    assert_eq!(foo.overridden(), 43);
+    let foo_obj: foo::Foo = glib::object::Object::builder().build();
+    assert_eq!(BasePropertiesExt::overridden(&foo_obj), 43);
+    assert_eq!(foo_obj.overridden(), 43);
 }
 
 #[test]