Skip to content

Commit 53497a5

Browse files
sdroegesdroege
authored
Merge pull request #1690 from gtk-rs/auto-pr-branch
Automated PR: Changes from updating gir/gir-files
2 parents bd27579 + f058628 commit 53497a5

39 files changed

+89
-107
lines changed

‎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 @ 5ce24253f28c)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ eae0d92546c1)

‎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 @ 5ce24253f28c)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ eae0d92546c1)

‎gio/src/auto/action_group.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub trait ActionGroupExt: IsA<ActionGroup> + 'static {
188188
let detailed_signal_name = detail.map(|name| format!("action-added::{name}\0"));
189189
let signal_name: &[u8] = detailed_signal_name
190190
.as_ref()
191-
.map_or(&b"action-added\0"[..], |n| n.as_bytes());
191+
.map_or(c"action-added".to_bytes(), |n| n.as_bytes());
192192
connect_raw(
193193
self.as_ptr() as *mut _,
194194
signal_name.as_ptr() as *const _,
@@ -228,7 +228,7 @@ pub trait ActionGroupExt: IsA<ActionGroup> + 'static {
228228
detail.map(|name| format!("action-enabled-changed::{name}\0"));
229229
let signal_name: &[u8] = detailed_signal_name
230230
.as_ref()
231-
.map_or(&b"action-enabled-changed\0"[..], |n| n.as_bytes());
231+
.map_or(c"action-enabled-changed".to_bytes(), |n| n.as_bytes());
232232
connect_raw(
233233
self.as_ptr() as *mut _,
234234
signal_name.as_ptr() as *const _,
@@ -265,7 +265,7 @@ pub trait ActionGroupExt: IsA<ActionGroup> + 'static {
265265
let detailed_signal_name = detail.map(|name| format!("action-removed::{name}\0"));
266266
let signal_name: &[u8] = detailed_signal_name
267267
.as_ref()
268-
.map_or(&b"action-removed\0"[..], |n| n.as_bytes());
268+
.map_or(c"action-removed".to_bytes(), |n| n.as_bytes());
269269
connect_raw(
270270
self.as_ptr() as *mut _,
271271
signal_name.as_ptr() as *const _,
@@ -304,7 +304,7 @@ pub trait ActionGroupExt: IsA<ActionGroup> + 'static {
304304
let detailed_signal_name = detail.map(|name| format!("action-state-changed::{name}\0"));
305305
let signal_name: &[u8] = detailed_signal_name
306306
.as_ref()
307-
.map_or(&b"action-state-changed\0"[..], |n| n.as_bytes());
307+
.map_or(c"action-state-changed".to_bytes(), |n| n.as_bytes());
308308
connect_raw(
309309
self.as_ptr() as *mut _,
310310
signal_name.as_ptr() as *const _,

‎gio/src/auto/app_info.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl AppInfo {
287287
user_data: glib::ffi::gpointer,
288288
) {
289289
let mut error = std::ptr::null_mut();
290-
let _ = ffi::g_app_info_launch_default_for_uri_finish(res, &mut error);
290+
ffi::g_app_info_launch_default_for_uri_finish(res, &mut error);
291291
let result = if error.is_null() {
292292
Ok(())
293293
} else {

‎gio/src/auto/async_initable.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub trait AsyncInitableExt: IsA<AsyncInitable> + 'static {
4545
user_data: glib::ffi::gpointer,
4646
) {
4747
let mut error = std::ptr::null_mut();
48-
let _ = ffi::g_async_initable_init_finish(_source_object as *mut _, res, &mut error);
48+
ffi::g_async_initable_init_finish(_source_object as *mut _, res, &mut error);
4949
let result = if error.is_null() {
5050
Ok(())
5151
} else {

‎gio/src/auto/dbus_connection.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ impl DBusConnection {
410410
user_data: glib::ffi::gpointer,
411411
) {
412412
let mut error = std::ptr::null_mut();
413-
let _ = ffi::g_dbus_connection_close_finish(_source_object as *mut _, res, &mut error);
413+
ffi::g_dbus_connection_close_finish(_source_object as *mut _, res, &mut error);
414414
let result = if error.is_null() {
415415
Ok(())
416416
} else {
@@ -519,7 +519,7 @@ impl DBusConnection {
519519
user_data: glib::ffi::gpointer,
520520
) {
521521
let mut error = std::ptr::null_mut();
522-
let _ = ffi::g_dbus_connection_flush_finish(_source_object as *mut _, res, &mut error);
522+
ffi::g_dbus_connection_flush_finish(_source_object as *mut _, res, &mut error);
523523
let result = if error.is_null() {
524524
Ok(())
525525
} else {

‎gio/src/auto/drive.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ pub trait DriveExt: IsA<Drive> + 'static {
8989
user_data: glib::ffi::gpointer,
9090
) {
9191
let mut error = std::ptr::null_mut();
92-
let _ =
93-
ffi::g_drive_eject_with_operation_finish(_source_object as *mut _, res, &mut error);
92+
ffi::g_drive_eject_with_operation_finish(_source_object as *mut _, res, &mut error);
9493
let result = if error.is_null() {
9594
Ok(())
9695
} else {
@@ -262,7 +261,7 @@ pub trait DriveExt: IsA<Drive> + 'static {
262261
user_data: glib::ffi::gpointer,
263262
) {
264263
let mut error = std::ptr::null_mut();
265-
let _ = ffi::g_drive_poll_for_media_finish(_source_object as *mut _, res, &mut error);
264+
ffi::g_drive_poll_for_media_finish(_source_object as *mut _, res, &mut error);
266265
let result = if error.is_null() {
267266
Ok(())
268267
} else {
@@ -323,7 +322,7 @@ pub trait DriveExt: IsA<Drive> + 'static {
323322
user_data: glib::ffi::gpointer,
324323
) {
325324
let mut error = std::ptr::null_mut();
326-
let _ = ffi::g_drive_start_finish(_source_object as *mut _, res, &mut error);
325+
ffi::g_drive_start_finish(_source_object as *mut _, res, &mut error);
327326
let result = if error.is_null() {
328327
Ok(())
329328
} else {
@@ -394,7 +393,7 @@ pub trait DriveExt: IsA<Drive> + 'static {
394393
user_data: glib::ffi::gpointer,
395394
) {
396395
let mut error = std::ptr::null_mut();
397-
let _ = ffi::g_drive_stop_finish(_source_object as *mut _, res, &mut error);
396+
ffi::g_drive_stop_finish(_source_object as *mut _, res, &mut error);
398397
let result = if error.is_null() {
399398
Ok(())
400399
} else {

‎gio/src/auto/dtls_connection.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pub trait DtlsConnectionExt: IsA<DtlsConnection> + 'static {
7777
user_data: glib::ffi::gpointer,
7878
) {
7979
let mut error = std::ptr::null_mut();
80-
let _ = ffi::g_dtls_connection_close_finish(_source_object as *mut _, res, &mut error);
80+
ffi::g_dtls_connection_close_finish(_source_object as *mut _, res, &mut error);
8181
let result = if error.is_null() {
8282
Ok(())
8383
} else {
@@ -289,8 +289,7 @@ pub trait DtlsConnectionExt: IsA<DtlsConnection> + 'static {
289289
user_data: glib::ffi::gpointer,
290290
) {
291291
let mut error = std::ptr::null_mut();
292-
let _ =
293-
ffi::g_dtls_connection_handshake_finish(_source_object as *mut _, res, &mut error);
292+
ffi::g_dtls_connection_handshake_finish(_source_object as *mut _, res, &mut error);
294293
let result = if error.is_null() {
295294
Ok(())
296295
} else {
@@ -451,8 +450,7 @@ pub trait DtlsConnectionExt: IsA<DtlsConnection> + 'static {
451450
user_data: glib::ffi::gpointer,
452451
) {
453452
let mut error = std::ptr::null_mut();
454-
let _ =
455-
ffi::g_dtls_connection_shutdown_finish(_source_object as *mut _, res, &mut error);
453+
ffi::g_dtls_connection_shutdown_finish(_source_object as *mut _, res, &mut error);
456454
let result = if error.is_null() {
457455
Ok(())
458456
} else {

‎gio/src/auto/file.rs‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ pub trait FileExt: IsA<File> + 'static {
514514
user_data: glib::ffi::gpointer,
515515
) {
516516
let mut error = std::ptr::null_mut();
517-
let _ = ffi::g_file_delete_finish(_source_object as *mut _, res, &mut error);
517+
ffi::g_file_delete_finish(_source_object as *mut _, res, &mut error);
518518
let result = if error.is_null() {
519519
Ok(())
520520
} else {
@@ -585,7 +585,7 @@ pub trait FileExt: IsA<File> + 'static {
585585
user_data: glib::ffi::gpointer,
586586
) {
587587
let mut error = std::ptr::null_mut();
588-
let _ = ffi::g_file_eject_mountable_with_operation_finish(
588+
ffi::g_file_eject_mountable_with_operation_finish(
589589
_source_object as *mut _,
590590
res,
591591
&mut error,
@@ -946,7 +946,7 @@ pub trait FileExt: IsA<File> + 'static {
946946
user_data: glib::ffi::gpointer,
947947
) {
948948
let mut error = std::ptr::null_mut();
949-
let _ = ffi::g_file_make_directory_finish(_source_object as *mut _, res, &mut error);
949+
ffi::g_file_make_directory_finish(_source_object as *mut _, res, &mut error);
950950
let result = if error.is_null() {
951951
Ok(())
952952
} else {
@@ -1121,11 +1121,7 @@ pub trait FileExt: IsA<File> + 'static {
11211121
user_data: glib::ffi::gpointer,
11221122
) {
11231123
let mut error = std::ptr::null_mut();
1124-
let _ = ffi::g_file_mount_enclosing_volume_finish(
1125-
_source_object as *mut _,
1126-
res,
1127-
&mut error,
1128-
);
1124+
ffi::g_file_mount_enclosing_volume_finish(_source_object as *mut _, res, &mut error);
11291125
let result = if error.is_null() {
11301126
Ok(())
11311127
} else {
@@ -1407,7 +1403,7 @@ pub trait FileExt: IsA<File> + 'static {
14071403
user_data: glib::ffi::gpointer,
14081404
) {
14091405
let mut error = std::ptr::null_mut();
1410-
let _ = ffi::g_file_poll_mountable_finish(_source_object as *mut _, res, &mut error);
1406+
ffi::g_file_poll_mountable_finish(_source_object as *mut _, res, &mut error);
14111407
let result = if error.is_null() {
14121408
Ok(())
14131409
} else {
@@ -2341,12 +2337,7 @@ pub trait FileExt: IsA<File> + 'static {
23412337
) {
23422338
let mut error = std::ptr::null_mut();
23432339
let mut info = std::ptr::null_mut();
2344-
let _ = ffi::g_file_set_attributes_finish(
2345-
_source_object as *mut _,
2346-
res,
2347-
&mut info,
2348-
&mut error,
2349-
);
2340+
ffi::g_file_set_attributes_finish(_source_object as *mut _, res, &mut info, &mut error);
23502341
let result = if error.is_null() {
23512342
Ok(from_glib_full(info))
23522343
} else {
@@ -2543,7 +2534,7 @@ pub trait FileExt: IsA<File> + 'static {
25432534
user_data: glib::ffi::gpointer,
25442535
) {
25452536
let mut error = std::ptr::null_mut();
2546-
let _ = ffi::g_file_start_mountable_finish(_source_object as *mut _, res, &mut error);
2537+
ffi::g_file_start_mountable_finish(_source_object as *mut _, res, &mut error);
25472538
let result = if error.is_null() {
25482539
Ok(())
25492540
} else {
@@ -2616,7 +2607,7 @@ pub trait FileExt: IsA<File> + 'static {
26162607
user_data: glib::ffi::gpointer,
26172608
) {
26182609
let mut error = std::ptr::null_mut();
2619-
let _ = ffi::g_file_stop_mountable_finish(_source_object as *mut _, res, &mut error);
2610+
ffi::g_file_stop_mountable_finish(_source_object as *mut _, res, &mut error);
26202611
let result = if error.is_null() {
26212612
Ok(())
26222613
} else {
@@ -2715,7 +2706,7 @@ pub trait FileExt: IsA<File> + 'static {
27152706
user_data: glib::ffi::gpointer,
27162707
) {
27172708
let mut error = std::ptr::null_mut();
2718-
let _ = ffi::g_file_trash_finish(_source_object as *mut _, res, &mut error);
2709+
ffi::g_file_trash_finish(_source_object as *mut _, res, &mut error);
27192710
let result = if error.is_null() {
27202711
Ok(())
27212712
} else {
@@ -2780,7 +2771,7 @@ pub trait FileExt: IsA<File> + 'static {
27802771
user_data: glib::ffi::gpointer,
27812772
) {
27822773
let mut error = std::ptr::null_mut();
2783-
let _ = ffi::g_file_unmount_mountable_with_operation_finish(
2774+
ffi::g_file_unmount_mountable_with_operation_finish(
27842775
_source_object as *mut _,
27852776
res,
27862777
&mut error,

‎gio/src/auto/file_enumerator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub trait FileEnumeratorExt: IsA<FileEnumerator> + 'static {
6565
user_data: glib::ffi::gpointer,
6666
) {
6767
let mut error = std::ptr::null_mut();
68-
let _ = ffi::g_file_enumerator_close_finish(_source_object as *mut _, res, &mut error);
68+
ffi::g_file_enumerator_close_finish(_source_object as *mut _, res, &mut error);
6969
let result = if error.is_null() {
7070
Ok(())
7171
} else {

0 commit comments

Comments
 (0)