changes

src/ext_idle_notify_v1_protocol.rs

@@ -11,80 +11,56 @@ use std::ptr;
 
 use wayland_client::protocol::__interfaces::wl_seat_interface;
 use wayland_sys::common::{wl_interface, wl_message};
-static mut ext_idle_notify_v1_types: [*const wl_interface; 3] = unsafe {
+static mut ext_idle_notify_v1_types: [*const wl_interface; 3] = [
-    [
+    ptr::addr_of!(ext_idle_notification_v1_interface),
-        ptr::addr_of!(ext_idle_notification_v1_interface),
+    ptr::null(),
-        0 as *const wl_interface,
+    ptr::addr_of!(wl_seat_interface).cast(),
-        ptr::addr_of!(wl_seat_interface).cast(),
+];
-    ]
-};
 static mut ext_idle_notifier_v1_requests: [wl_message; 2] = [
     wl_message {
-        name: (b"destroy\0" as *const u8).cast::<libc::c_char>(),
+        name: b"destroy\0".as_ptr().cast(),
-        signature: (b"\0" as *const u8).cast::<libc::c_char>(),
+        signature: b"\0".as_ptr().cast(),
-        types: unsafe {
+        types: unsafe { ext_idle_notify_v1_types.as_mut_ptr() },
-            ext_idle_notify_v1_types
-                .as_mut_ptr()
-                .offset(0 as libc::c_int as isize)
-        },
     },
     wl_message {
-        name: (b"get_idle_notification\0" as *const u8).cast::<libc::c_char>(),
+        name: b"get_idle_notification\0".as_ptr().cast(),
-        signature: (b"nuo\0" as *const u8).cast::<libc::c_char>(),
+        signature: b"nuo\0".as_ptr().cast(),
-        types: unsafe {
+        types: unsafe { ext_idle_notify_v1_types.as_mut_ptr() },
-            ext_idle_notify_v1_types
-                .as_mut_ptr()
-                .offset(0 as libc::c_int as isize)
-        },
     },
 ];
 #[no_mangle]
 pub static mut ext_idle_notifier_v1_interface: wl_interface = wl_interface {
-    name: (b"ext_idle_notifier_v1\0" as *const u8).cast::<libc::c_char>(),
+    name: b"ext_idle_notifier_v1\0".as_ptr().cast(),
-    version: 1 as libc::c_int,
+    version: 1,
-    request_count: 2 as libc::c_int,
+    request_count: 2,
     requests: unsafe { ext_idle_notifier_v1_requests.as_ptr() },
-    event_count: 0 as libc::c_int,
+    event_count: 0,
-    events: 0 as *const wl_message,
+    events: ptr::null(),
 };
 
 static mut ext_idle_notification_v1_requests: [wl_message; 1] = [wl_message {
-    name: (b"destroy\0" as *const u8).cast::<libc::c_char>(),
+    name: b"destroy\0".as_ptr().cast(),
-    signature: (b"\0" as *const u8).cast::<libc::c_char>(),
+    signature: b"\0".as_ptr().cast(),
-    types: unsafe {
+    types: unsafe { ext_idle_notify_v1_types.as_mut_ptr() },
-        ext_idle_notify_v1_types
-            .as_mut_ptr()
-            .offset(0 as libc::c_int as isize)
-    },
 }];
 static mut ext_idle_notification_v1_events: [wl_message; 2] = [
     wl_message {
-        name: (b"idled\0" as *const u8).cast::<libc::c_char>(),
+        name: b"idled\0".as_ptr().cast(),
-        signature: (b"\0" as *const u8).cast::<libc::c_char>(),
+        signature: b"\0".as_ptr().cast(),
-        types: unsafe {
+        types: unsafe { ext_idle_notify_v1_types.as_mut_ptr() },
-            ext_idle_notify_v1_types
-                .as_mut_ptr()
-                .offset(0 as libc::c_int as isize)
-        },
     },
     wl_message {
-        name: (b"resumed\0" as *const u8).cast::<libc::c_char>(),
+        name: b"resumed\0".as_ptr().cast(),
-        signature: (b"\0" as *const u8).cast::<libc::c_char>(),
+        signature: b"\0".as_ptr().cast(),
-        types: unsafe {
+        types: unsafe { ext_idle_notify_v1_types.as_mut_ptr() },
-            ext_idle_notify_v1_types
-                .as_mut_ptr()
-                .offset(0 as libc::c_int as isize)
-        },
     },
 ];
 #[no_mangle]
-pub static mut ext_idle_notification_v1_interface: wl_interface = unsafe {
+pub static ext_idle_notification_v1_interface: wl_interface = wl_interface {
-    wl_interface {
+    name: b"ext_idle_notification_v1\0".as_ptr().cast(),
-        name: (b"ext_idle_notification_v1\0" as *const u8).cast::<libc::c_char>(),
+    version: 1,
-        version: 1 as libc::c_int,
+    request_count: 1,
-        request_count: 1 as libc::c_int,
+    requests: unsafe { ext_idle_notification_v1_requests.as_ptr() },
-        requests: ext_idle_notification_v1_requests.as_ptr(),
+    event_count: 2,
-        event_count: 2 as libc::c_int,
+    events: unsafe { ext_idle_notification_v1_events.as_ptr() },
-        events: ext_idle_notification_v1_events.as_ptr(),
-    }
 };