Skip to content

Commit 2e2b91a

Browse files
sdroegesdroege
committed
Regenerate with latest gir
See gtk-rs/gir#1421
1 parent a1637ab commit 2e2b91a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+862
-272
lines changed

‎gdk-pixbuf/src/auto/enums.rs

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ impl fmt::Display for Colorspace {
3434
impl IntoGlib for Colorspace {
3535
type GlibType = ffi::GdkColorspace;
3636

37+
#[inline]
3738
fn into_glib(self) -> ffi::GdkColorspace {
3839
match self {
3940
Self::Rgb => ffi::GDK_COLORSPACE_RGB,
@@ -44,6 +45,7 @@ impl IntoGlib for Colorspace {
4445

4546
#[doc(hidden)]
4647
impl FromGlib<ffi::GdkColorspace> for Colorspace {
48+
#[inline]
4749
unsafe fn from_glib(value: ffi::GdkColorspace) -> Self {
4850
match value {
4951
ffi::GDK_COLORSPACE_RGB => Self::Rgb,
@@ -53,6 +55,7 @@ impl FromGlib<ffi::GdkColorspace> for Colorspace {
5355
}
5456

5557
impl StaticType for Colorspace {
58+
#[inline]
5659
fn static_type() -> Type {
5760
unsafe { from_glib(ffi::gdk_colorspace_get_type()) }
5861
}
@@ -65,12 +68,14 @@ impl glib::value::ValueType for Colorspace {
6568
unsafe impl<'a> FromValue<'a> for Colorspace {
6669
type Checker = glib::value::GenericValueTypeChecker<Self>;
6770

71+
#[inline]
6872
unsafe fn from_value(value: &'a glib::Value) -> Self {
6973
from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0))
7074
}
7175
}
7276

7377
impl ToValue for Colorspace {
78+
#[inline]
7479
fn to_value(&self) -> glib::Value {
7580
let mut value = glib::Value::for_value_type::<Self>();
7681
unsafe {
@@ -79,6 +84,7 @@ impl ToValue for Colorspace {
7984
value
8085
}
8186

87+
#[inline]
8288
fn value_type(&self) -> glib::Type {
8389
Self::static_type()
8490
}
@@ -127,6 +133,7 @@ impl fmt::Display for InterpType {
127133
impl IntoGlib for InterpType {
128134
type GlibType = ffi::GdkInterpType;
129135

136+
#[inline]
130137
fn into_glib(self) -> ffi::GdkInterpType {
131138
match self {
132139
Self::Nearest => ffi::GDK_INTERP_NEAREST,
@@ -140,6 +147,7 @@ impl IntoGlib for InterpType {
140147

141148
#[doc(hidden)]
142149
impl FromGlib<ffi::GdkInterpType> for InterpType {
150+
#[inline]
143151
unsafe fn from_glib(value: ffi::GdkInterpType) -> Self {
144152
match value {
145153
ffi::GDK_INTERP_NEAREST => Self::Nearest,
@@ -152,6 +160,7 @@ impl FromGlib<ffi::GdkInterpType> for InterpType {
152160
}
153161

154162
impl StaticType for InterpType {
163+
#[inline]
155164
fn static_type() -> Type {
156165
unsafe { from_glib(ffi::gdk_interp_type_get_type()) }
157166
}
@@ -164,12 +173,14 @@ impl glib::value::ValueType for InterpType {
164173
unsafe impl<'a> FromValue<'a> for InterpType {
165174
type Checker = glib::value::GenericValueTypeChecker<Self>;
166175

176+
#[inline]
167177
unsafe fn from_value(value: &'a glib::Value) -> Self {
168178
from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0))
169179
}
170180
}
171181

172182
impl ToValue for InterpType {
183+
#[inline]
173184
fn to_value(&self) -> glib::Value {
174185
let mut value = glib::Value::for_value_type::<Self>();
175186
unsafe {
@@ -178,6 +189,7 @@ impl ToValue for InterpType {
178189
value
179190
}
180191

192+
#[inline]
181193
fn value_type(&self) -> glib::Type {
182194
Self::static_type()
183195
}
@@ -223,6 +235,7 @@ impl fmt::Display for PixbufAlphaMode {
223235
impl IntoGlib for PixbufAlphaMode {
224236
type GlibType = ffi::GdkPixbufAlphaMode;
225237

238+
#[inline]
226239
fn into_glib(self) -> ffi::GdkPixbufAlphaMode {
227240
match self {
228241
Self::Bilevel => ffi::GDK_PIXBUF_ALPHA_BILEVEL,
@@ -235,6 +248,7 @@ impl IntoGlib for PixbufAlphaMode {
235248
#[allow(deprecated)]
236249
#[doc(hidden)]
237250
impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
251+
#[inline]
238252
unsafe fn from_glib(value: ffi::GdkPixbufAlphaMode) -> Self {
239253
match value {
240254
ffi::GDK_PIXBUF_ALPHA_BILEVEL => Self::Bilevel,
@@ -246,6 +260,7 @@ impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
246260

247261
#[allow(deprecated)]
248262
impl StaticType for PixbufAlphaMode {
263+
#[inline]
249264
fn static_type() -> Type {
250265
unsafe { from_glib(ffi::gdk_pixbuf_alpha_mode_get_type()) }
251266
}
@@ -260,13 +275,15 @@ impl glib::value::ValueType for PixbufAlphaMode {
260275
unsafe impl<'a> FromValue<'a> for PixbufAlphaMode {
261276
type Checker = glib::value::GenericValueTypeChecker<Self>;
262277

278+
#[inline]
263279
unsafe fn from_value(value: &'a glib::Value) -> Self {
264280
from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0))
265281
}
266282
}
267283

268284
#[allow(deprecated)]
269285
impl ToValue for PixbufAlphaMode {
286+
#[inline]
270287
fn to_value(&self) -> glib::Value {
271288
let mut value = glib::Value::for_value_type::<Self>();
272289
unsafe {
@@ -275,6 +292,7 @@ impl ToValue for PixbufAlphaMode {
275292
value
276293
}
277294

295+
#[inline]
278296
fn value_type(&self) -> glib::Type {
279297
Self::static_type()
280298
}
@@ -333,6 +351,7 @@ impl fmt::Display for PixbufError {
333351
impl IntoGlib for PixbufError {
334352
type GlibType = ffi::GdkPixbufError;
335353

354+
#[inline]
336355
fn into_glib(self) -> ffi::GdkPixbufError {
337356
match self {
338357
Self::CorruptImage => ffi::GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
@@ -349,6 +368,7 @@ impl IntoGlib for PixbufError {
349368

350369
#[doc(hidden)]
351370
impl FromGlib<ffi::GdkPixbufError> for PixbufError {
371+
#[inline]
352372
unsafe fn from_glib(value: ffi::GdkPixbufError) -> Self {
353373
match value {
354374
ffi::GDK_PIXBUF_ERROR_CORRUPT_IMAGE => Self::CorruptImage,
@@ -364,29 +384,28 @@ impl FromGlib<ffi::GdkPixbufError> for PixbufError {
364384
}
365385

366386
impl ErrorDomain for PixbufError {
387+
#[inline]
367388
fn domain() -> Quark {
368389
unsafe { from_glib(ffi::gdk_pixbuf_error_quark()) }
369390
}
370391

392+
#[inline]
371393
fn code(self) -> i32 {
372394
self.into_glib()
373395
}
374396

397+
#[inline]
398+
#[allow(clippy::match_single_binding)]
375399
fn from(code: i32) -> Option<Self> {
376-
match code {
377-
ffi::GDK_PIXBUF_ERROR_CORRUPT_IMAGE => Some(Self::CorruptImage),
378-
ffi::GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY => Some(Self::InsufficientMemory),
379-
ffi::GDK_PIXBUF_ERROR_BAD_OPTION => Some(Self::BadOption),
380-
ffi::GDK_PIXBUF_ERROR_UNKNOWN_TYPE => Some(Self::UnknownType),
381-
ffi::GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION => Some(Self::UnsupportedOperation),
382-
ffi::GDK_PIXBUF_ERROR_FAILED => Some(Self::Failed),
383-
ffi::GDK_PIXBUF_ERROR_INCOMPLETE_ANIMATION => Some(Self::IncompleteAnimation),
384-
_ => Some(Self::Failed),
400+
match unsafe { from_glib(code) } {
401+
Self::__Unknown(_) => Some(Self::Failed),
402+
value => Some(value),
385403
}
386404
}
387405
}
388406

389407
impl StaticType for PixbufError {
408+
#[inline]
390409
fn static_type() -> Type {
391410
unsafe { from_glib(ffi::gdk_pixbuf_error_get_type()) }
392411
}
@@ -399,12 +418,14 @@ impl glib::value::ValueType for PixbufError {
399418
unsafe impl<'a> FromValue<'a> for PixbufError {
400419
type Checker = glib::value::GenericValueTypeChecker<Self>;
401420

421+
#[inline]
402422
unsafe fn from_value(value: &'a glib::Value) -> Self {
403423
from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0))
404424
}
405425
}
406426

407427
impl ToValue for PixbufError {
428+
#[inline]
408429
fn to_value(&self) -> glib::Value {
409430
let mut value = glib::Value::for_value_type::<Self>();
410431
unsafe {
@@ -413,6 +434,7 @@ impl ToValue for PixbufError {
413434
value
414435
}
415436

437+
#[inline]
416438
fn value_type(&self) -> glib::Type {
417439
Self::static_type()
418440
}
@@ -461,6 +483,7 @@ impl fmt::Display for PixbufRotation {
461483
impl IntoGlib for PixbufRotation {
462484
type GlibType = ffi::GdkPixbufRotation;
463485

486+
#[inline]
464487
fn into_glib(self) -> ffi::GdkPixbufRotation {
465488
match self {
466489
Self::None => ffi::GDK_PIXBUF_ROTATE_NONE,
@@ -474,6 +497,7 @@ impl IntoGlib for PixbufRotation {
474497

475498
#[doc(hidden)]
476499
impl FromGlib<ffi::GdkPixbufRotation> for PixbufRotation {
500+
#[inline]
477501
unsafe fn from_glib(value: ffi::GdkPixbufRotation) -> Self {
478502
match value {
479503
ffi::GDK_PIXBUF_ROTATE_NONE => Self::None,
@@ -486,6 +510,7 @@ impl FromGlib<ffi::GdkPixbufRotation> for PixbufRotation {
486510
}
487511

488512
impl StaticType for PixbufRotation {
513+
#[inline]
489514
fn static_type() -> Type {
490515
unsafe { from_glib(ffi::gdk_pixbuf_rotation_get_type()) }
491516
}
@@ -498,12 +523,14 @@ impl glib::value::ValueType for PixbufRotation {
498523
unsafe impl<'a> FromValue<'a> for PixbufRotation {
499524
type Checker = glib::value::GenericValueTypeChecker<Self>;
500525

526+
#[inline]
501527
unsafe fn from_value(value: &'a glib::Value) -> Self {
502528
from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0))
503529
}
504530
}
505531

506532
impl ToValue for PixbufRotation {
533+
#[inline]
507534
fn to_value(&self) -> glib::Value {
508535
let mut value = glib::Value::for_value_type::<Self>();
509536
unsafe {
@@ -512,6 +539,7 @@ impl ToValue for PixbufRotation {
512539
value
513540
}
514541

542+
#[inline]
515543
fn value_type(&self) -> glib::Type {
516544
Self::static_type()
517545
}

‎gdk-pixbuf/src/auto/flags.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ impl fmt::Display for PixbufFormatFlags {
2828
impl IntoGlib for PixbufFormatFlags {
2929
type GlibType = ffi::GdkPixbufFormatFlags;
3030

31+
#[inline]
3132
fn into_glib(self) -> ffi::GdkPixbufFormatFlags {
3233
self.bits()
3334
}
3435
}
3536

3637
#[doc(hidden)]
3738
impl FromGlib<ffi::GdkPixbufFormatFlags> for PixbufFormatFlags {
39+
#[inline]
3840
unsafe fn from_glib(value: ffi::GdkPixbufFormatFlags) -> Self {
3941
Self::from_bits_truncate(value)
4042
}

‎gdk-pixbuf/src/auto/pixbuf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ impl Pixbuf {
667667
unsafe {
668668
let mut error = ptr::null_mut();
669669
let is_ok = ffi::gdk_pixbuf_init_modules(path.to_glib_none().0, &mut error);
670-
assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
670+
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
671671
if error.is_null() {
672672
Ok(())
673673
} else {

‎gdk-pixbuf/src/auto/pixbuf_loader.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
109109
unsafe {
110110
let mut error = ptr::null_mut();
111111
let is_ok = ffi::gdk_pixbuf_loader_close(self.as_ref().to_glib_none().0, &mut error);
112-
assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
112+
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
113113
if error.is_null() {
114114
Ok(())
115115
} else {
@@ -158,7 +158,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
158158
count,
159159
&mut error,
160160
);
161-
assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
161+
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
162162
if error.is_null() {
163163
Ok(())
164164
} else {
@@ -175,7 +175,7 @@ impl<O: IsA<PixbufLoader>> PixbufLoaderExt for O {
175175
buffer.to_glib_none().0,
176176
&mut error,
177177
);
178-
assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
178+
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
179179
if error.is_null() {
180180
Ok(())
181181
} else {

‎gdk-pixbuf/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 81c03ad94bb2)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 5d24c2e70796)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 751a9c9d62f5)

‎gdk-pixbuf/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 81c03ad94bb2)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 5d24c2e70796)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 751a9c9d62f5)

‎gio/src/auto/action.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl Action {
4040
&mut target_value,
4141
&mut error,
4242
);
43-
assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
43+
debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
4444
if error.is_null() {
4545
Ok((from_glib_full(action_name), from_glib_full(target_value)))
4646
} else {

0 commit comments

Comments
 (0)