Skip to content

Commit aa75187

Browse files
sdroegesdroege
authored
Merge pull request #840 from jf2048/fix-abi-tests
Fix ABI tests
2 parents 83fe55c + 5c33867 commit aa75187

Some content is hidden

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

43 files changed

+122
-82
lines changed

‎.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
conf:
2323
- { name: "cairo", features: "png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface", nightly: "--features 'png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface'", test_sys: true }
2424
- { name: "gdk-pixbuf", features: "v2_42", nightly: "--all-features", test_sys: true }
25-
- { name: "gio", features: "v2_74", nightly: "--all-features", test_sys: false }
26-
- { name: "glib", features: "v2_74", nightly: "--all-features", test_sys: false }
25+
- { name: "gio", features: "v2_74", nightly: "--all-features", test_sys: true }
26+
- { name: "glib", features: "v2_74", nightly: "--all-features", test_sys: true }
2727
- { name: "graphene", features: "", nightly: "", test_sys: true }
28-
- { name: "pango", features: "v1_50", nightly: "--all-features", test_sys: false }
28+
- { name: "pango", features: "v1_50", nightly: "--all-features", test_sys: true }
2929
- { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
3030
steps:
3131
- uses: actions/checkout@v3

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ pub enum PixbufAlphaMode {
207207
__Unknown(i32),
208208
}
209209

210+
#[allow(deprecated)]
210211
impl fmt::Display for PixbufAlphaMode {
211212
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
212213
write!(
@@ -221,6 +222,7 @@ impl fmt::Display for PixbufAlphaMode {
221222
}
222223
}
223224

225+
#[allow(deprecated)]
224226
#[doc(hidden)]
225227
impl IntoGlib for PixbufAlphaMode {
226228
type GlibType = ffi::GdkPixbufAlphaMode;
@@ -234,6 +236,7 @@ impl IntoGlib for PixbufAlphaMode {
234236
}
235237
}
236238

239+
#[allow(deprecated)]
237240
#[doc(hidden)]
238241
impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
239242
unsafe fn from_glib(value: ffi::GdkPixbufAlphaMode) -> Self {
@@ -245,16 +248,19 @@ impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
245248
}
246249
}
247250

251+
#[allow(deprecated)]
248252
impl StaticType for PixbufAlphaMode {
249253
fn static_type() -> Type {
250254
unsafe { from_glib(ffi::gdk_pixbuf_alpha_mode_get_type()) }
251255
}
252256
}
253257

258+
#[allow(deprecated)]
254259
impl glib::value::ValueType for PixbufAlphaMode {
255260
type Type = Self;
256261
}
257262

263+
#[allow(deprecated)]
258264
unsafe impl<'a> FromValue<'a> for PixbufAlphaMode {
259265
type Checker = glib::value::GenericValueTypeChecker<Self>;
260266

@@ -263,6 +269,7 @@ unsafe impl<'a> FromValue<'a> for PixbufAlphaMode {
263269
}
264270
}
265271

272+
#[allow(deprecated)]
266273
impl ToValue for PixbufAlphaMode {
267274
fn to_value(&self) -> glib::Value {
268275
let mut value = glib::Value::for_value_type::<Self>();
@@ -277,6 +284,7 @@ impl ToValue for PixbufAlphaMode {
277284
}
278285
}
279286

287+
#[allow(deprecated)]
280288
impl From<PixbufAlphaMode> for glib::Value {
281289
#[inline]
282290
fn from(v: PixbufAlphaMode) -> Self {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub use self::pixbuf_format::PixbufFormat;
2323
mod enums;
2424
pub use self::enums::Colorspace;
2525
pub use self::enums::InterpType;
26+
#[allow(deprecated)]
2627
pub use self::enums::PixbufAlphaMode;
2728
pub use self::enums::PixbufError;
2829
pub use self::enums::PixbufRotation;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 6ec1537f60e3)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)

‎gdk-pixbuf/sys/tests/abi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
44

5+
#![cfg(target_os = "linux")]
6+
57
use gdk_pixbuf_sys::*;
68
use std::env;
79
use std::error::Error;
@@ -110,7 +112,6 @@ impl Results {
110112
}
111113

112114
#[test]
113-
#[cfg(target_os = "linux")]
114115
fn cross_validate_constants_with_c() {
115116
let mut c_constants: Vec<(String, String)> = Vec::new();
116117

@@ -145,7 +146,6 @@ fn cross_validate_constants_with_c() {
145146
}
146147

147148
#[test]
148-
#[cfg(target_os = "linux")]
149149
fn cross_validate_layout_with_c() {
150150
let mut c_layouts = Vec::new();
151151

‎gdk-pixbuf/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 6ec1537f60e3)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)

‎gio/src/auto/enums.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,6 +4043,7 @@ pub enum TlsRehandshakeMode {
40434043
__Unknown(i32),
40444044
}
40454045

4046+
#[allow(deprecated)]
40464047
impl fmt::Display for TlsRehandshakeMode {
40474048
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
40484049
write!(
@@ -4058,6 +4059,7 @@ impl fmt::Display for TlsRehandshakeMode {
40584059
}
40594060
}
40604061

4062+
#[allow(deprecated)]
40614063
#[doc(hidden)]
40624064
impl IntoGlib for TlsRehandshakeMode {
40634065
type GlibType = ffi::GTlsRehandshakeMode;
@@ -4072,6 +4074,7 @@ impl IntoGlib for TlsRehandshakeMode {
40724074
}
40734075
}
40744076

4077+
#[allow(deprecated)]
40754078
#[doc(hidden)]
40764079
impl FromGlib<ffi::GTlsRehandshakeMode> for TlsRehandshakeMode {
40774080
unsafe fn from_glib(value: ffi::GTlsRehandshakeMode) -> Self {
@@ -4084,16 +4087,19 @@ impl FromGlib<ffi::GTlsRehandshakeMode> for TlsRehandshakeMode {
40844087
}
40854088
}
40864089

4090+
#[allow(deprecated)]
40874091
impl StaticType for TlsRehandshakeMode {
40884092
fn static_type() -> Type {
40894093
unsafe { from_glib(ffi::g_tls_rehandshake_mode_get_type()) }
40904094
}
40914095
}
40924096

4097+
#[allow(deprecated)]
40934098
impl glib::value::ValueType for TlsRehandshakeMode {
40944099
type Type = Self;
40954100
}
40964101

4102+
#[allow(deprecated)]
40974103
unsafe impl<'a> FromValue<'a> for TlsRehandshakeMode {
40984104
type Checker = glib::value::GenericValueTypeChecker<Self>;
40994105

@@ -4102,6 +4108,7 @@ unsafe impl<'a> FromValue<'a> for TlsRehandshakeMode {
41024108
}
41034109
}
41044110

4111+
#[allow(deprecated)]
41054112
impl ToValue for TlsRehandshakeMode {
41064113
fn to_value(&self) -> glib::Value {
41074114
let mut value = glib::Value::for_value_type::<Self>();
@@ -4116,6 +4123,7 @@ impl ToValue for TlsRehandshakeMode {
41164123
}
41174124
}
41184125

4126+
#[allow(deprecated)]
41194127
impl From<TlsRehandshakeMode> for glib::Value {
41204128
#[inline]
41214129
fn from(v: TlsRehandshakeMode) -> Self {

‎gio/src/auto/file_info.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This file was generated by gir (https://github.com/gtk-rs/gir)
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
4+
#![allow(deprecated)]
45

56
use crate::FileAttributeMatcher;
67
use crate::FileAttributeStatus;

‎gio/src/auto/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ pub use self::enums::TlsInteractionResult;
502502
#[cfg(any(feature = "v2_70", feature = "dox"))]
503503
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_70")))]
504504
pub use self::enums::TlsProtocolVersion;
505+
#[allow(deprecated)]
505506
pub use self::enums::TlsRehandshakeMode;
506507
#[cfg(any(unix, feature = "dox"))]
507508
#[cfg_attr(feature = "dox", doc(cfg(unix)))]
@@ -676,6 +677,7 @@ pub use self::constants::TLS_DATABASE_PURPOSE_AUTHENTICATE_CLIENT;
676677
pub use self::constants::TLS_DATABASE_PURPOSE_AUTHENTICATE_SERVER;
677678
pub use self::constants::VFS_EXTENSION_POINT_NAME;
678679
pub use self::constants::VOLUME_IDENTIFIER_KIND_CLASS;
680+
#[allow(deprecated)]
679681
pub use self::constants::VOLUME_IDENTIFIER_KIND_HAL_UDI;
680682
pub use self::constants::VOLUME_IDENTIFIER_KIND_LABEL;
681683
pub use self::constants::VOLUME_IDENTIFIER_KIND_NFS_MOUNT;

‎gio/src/auto/socket_client.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This file was generated by gir (https://github.com/gtk-rs/gir)
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
4+
#![allow(deprecated)]
45

56
use crate::AsyncResult;
67
use crate::Cancellable;
@@ -177,6 +178,7 @@ pub trait SocketClientExt: 'static {
177178
fn is_tls(&self) -> bool;
178179

179180
#[cfg_attr(feature = "v2_72", deprecated = "Since 2.72")]
181+
#[allow(deprecated)]
180182
#[doc(alias = "g_socket_client_get_tls_validation_flags")]
181183
#[doc(alias = "get_tls_validation_flags")]
182184
fn tls_validation_flags(&self) -> TlsCertificateFlags;
@@ -206,6 +208,7 @@ pub trait SocketClientExt: 'static {
206208
fn set_tls(&self, tls: bool);
207209

208210
#[cfg_attr(feature = "v2_72", deprecated = "Since 2.72")]
211+
#[allow(deprecated)]
209212
#[doc(alias = "g_socket_client_set_tls_validation_flags")]
210213
fn set_tls_validation_flags(&self, flags: TlsCertificateFlags);
211214

@@ -696,6 +699,7 @@ impl<O: IsA<SocketClient>> SocketClientExt for O {
696699
unsafe { from_glib(ffi::g_socket_client_get_tls(self.as_ref().to_glib_none().0)) }
697700
}
698701

702+
#[allow(deprecated)]
699703
fn tls_validation_flags(&self) -> TlsCertificateFlags {
700704
unsafe {
701705
from_glib(ffi::g_socket_client_get_tls_validation_flags(
@@ -761,6 +765,7 @@ impl<O: IsA<SocketClient>> SocketClientExt for O {
761765
}
762766
}
763767

768+
#[allow(deprecated)]
764769
fn set_tls_validation_flags(&self, flags: TlsCertificateFlags) {
765770
unsafe {
766771
ffi::g_socket_client_set_tls_validation_flags(

0 commit comments

Comments
 (0)