Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix / work around a couple of new clippy 1.75 warnings #1254

Merged
merged 1 commit into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cairo/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would've said that this should get a bugfix release but considering that nobody noticed the lack of those types in the public API for years....

Antialias, FontExtents, FontFace, FontOptions, FontSlant, FontType, FontWeight, Glyph,
HintMetrics, HintStyle, ScaledFont, SubpixelOrder, TextCluster, TextExtents, UserFontFace,
},
image_surface::{ImageSurface, ImageSurfaceData, ImageSurfaceDataOwned},
matrices::Matrix,
Expand Down
5 changes: 3 additions & 2 deletions gdk-pixbuf/src/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
3 changes: 2 additions & 1 deletion gdk-pixbuf/src/subclass/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
6 changes: 3 additions & 3 deletions glib-macros/tests/properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down