Skip to content

Commit ee2d53e

Browse files
A6GibKmA6GibKm
committed
Run cargo fix --edition
1 parent b0d3938 commit ee2d53e

File tree

98 files changed

+719
-719
lines changed

Some content is hidden

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

98 files changed

+719
-719
lines changed

‎gdk4-macos/sys/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ impl ::std::fmt::Debug for GdkMacosSurface {
189189
}
190190
}
191191

192-
extern "C" {
192+
unsafe extern "C" {
193193

194194
//=========================================================================
195195
// GdkMacosDevice

‎gdk4-wayland/sys/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ impl ::std::fmt::Debug for GdkWaylandToplevel {
189189
}
190190
}
191191

192-
extern "C" {
192+
unsafe extern "C" {
193193

194194
//=========================================================================
195195
// GdkWaylandDevice

‎gdk4-win32/sys/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl ::std::fmt::Debug for GdkWin32Surface {
256256
}
257257
}
258258

259-
extern "C" {
259+
unsafe extern "C" {
260260

261261
//=========================================================================
262262
// GdkD3D12Texture

‎gdk4-x11/sys/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl ::std::fmt::Debug for GdkX11Surface {
240240
}
241241
}
242242

243-
extern "C" {
243+
unsafe extern "C" {
244244

245245
//=========================================================================
246246
// GdkX11AppLaunchContext

‎gdk4/src/cairo_interaction.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub trait GdkCairoContextExt: sealed::Sealed {
4343
y: i32,
4444
width: i32,
4545
height: i32,
46-
) {
46+
) { unsafe {
4747
skip_assert_initialized!();
4848
ffi::gdk_cairo_draw_from_gl(
4949
self.to_raw(),
@@ -56,7 +56,7 @@ pub trait GdkCairoContextExt: sealed::Sealed {
5656
width,
5757
height,
5858
);
59-
}
59+
}}
6060

6161
#[doc(alias = "gdk_cairo_set_source_rgba")]
6262
#[doc(alias = "set_source_rgba")]

‎gdk4/src/clipboard.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl Clipboard {
3333
_source_object: *mut glib::gobject_ffi::GObject,
3434
res: *mut gio::ffi::GAsyncResult,
3535
user_data: glib::ffi::gpointer,
36-
) {
36+
) { unsafe {
3737
let mut error = ptr::null_mut();
3838
let mut out_mime_type = ptr::null();
3939
let ret = ffi::gdk_clipboard_read_finish(
@@ -51,7 +51,7 @@ impl Clipboard {
5151
Box::from_raw(user_data as *mut _);
5252
let callback = callback.into_inner();
5353
callback(result);
54-
}
54+
}}
5555
let callback = read_async_trampoline::<Q>;
5656
unsafe {
5757
ffi::gdk_clipboard_read_async(

‎gdk4/src/drop.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl Drop {
3333
_source_object: *mut glib::gobject_ffi::GObject,
3434
res: *mut gio::ffi::GAsyncResult,
3535
user_data: glib::ffi::gpointer,
36-
) {
36+
) { unsafe {
3737
let mut error = ptr::null_mut();
3838
let mut out_mime_type = ptr::null();
3939
let ret = ffi::gdk_drop_read_finish(
@@ -51,7 +51,7 @@ impl Drop {
5151
Box::from_raw(user_data as *mut _);
5252
let callback = callback.into_inner();
5353
callback(result);
54-
}
54+
}}
5555
let callback = read_async_trampoline::<Q>;
5656
unsafe {
5757
ffi::gdk_drop_read_async(

‎gdk4/src/event.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ macro_rules! define_event {
166166
#[doc(hidden)]
167167
impl glib::translate::FromGlibPtrFull<*mut crate::ffi::GdkEvent> for $rust_type {
168168
#[inline]
169-
unsafe fn from_glib_full(ptr: *mut crate::ffi::GdkEvent) -> Self {
169+
unsafe fn from_glib_full(ptr: *mut crate::ffi::GdkEvent) -> Self { unsafe {
170170
glib::translate::FromGlibPtrFull::from_glib_full(ptr as *mut $ffi_type)
171-
}
171+
}}
172172
}
173173

174174
impl $rust_type {

‎gdk4/src/functions.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub fn content_deserialize_async<R: FnOnce(Result<glib::Value, glib::Error>) + '
5959
_source_object: *mut glib::gobject_ffi::GObject,
6060
res: *mut gio::ffi::GAsyncResult,
6161
user_data: glib::ffi::gpointer,
62-
) {
62+
) { unsafe {
6363
let mut error = ptr::null_mut();
6464
let mut value = glib::Value::uninitialized();
6565
let _ = ffi::gdk_content_deserialize_finish(res, value.to_glib_none_mut().0, &mut error);
@@ -71,7 +71,7 @@ pub fn content_deserialize_async<R: FnOnce(Result<glib::Value, glib::Error>) + '
7171
let callback: Box<glib::thread_guard::ThreadGuard<R>> = Box::from_raw(user_data as *mut _);
7272
let callback = callback.into_inner();
7373
callback(result);
74-
}
74+
}}
7575
let callback = content_deserialize_async_trampoline::<R>;
7676
unsafe {
7777
ffi::gdk_content_deserialize_async(
@@ -126,7 +126,7 @@ pub fn content_register_deserializer<
126126
P: Fn(&ContentDeserializer, &mut Option<T>) + 'static,
127127
>(
128128
deserializer: *mut ffi::GdkContentDeserializer,
129-
) {
129+
) { unsafe {
130130
let deserializer: ContentDeserializer = from_glib_full(deserializer);
131131
let callback: &P =
132132
&*(ffi::gdk_content_deserializer_get_user_data(deserializer.to_glib_none().0)
@@ -135,9 +135,9 @@ pub fn content_register_deserializer<
135135
let mut task_data: *mut Option<T> =
136136
ffi::gdk_content_deserializer_get_task_data(deserializer.to_glib_none().0) as *mut _;
137137
if task_data.is_null() {
138-
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) {
138+
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) { unsafe {
139139
let _task_data: Box<Option<T>> = Box::from_raw(data as *mut _);
140-
}
140+
}}
141141
task_data = Box::into_raw(Box::new(None));
142142
ffi::gdk_content_deserializer_set_task_data(
143143
deserializer.to_glib_none().0,
@@ -147,16 +147,16 @@ pub fn content_register_deserializer<
147147
}
148148

149149
(*callback)(&deserializer, &mut *task_data);
150-
}
150+
}}
151151
let deserialize = Some(deserialize_func::<T, P> as _);
152152
unsafe extern "C" fn notify_func<
153153
T: 'static,
154154
P: Fn(&ContentDeserializer, &mut Option<T>) + 'static,
155155
>(
156156
data: glib::ffi::gpointer,
157-
) {
157+
) { unsafe {
158158
let _callback: Box<P> = Box::from_raw(data as *mut _);
159-
}
159+
}}
160160
let destroy_call4 = Some(notify_func::<T, P> as _);
161161
let super_callback0: Box<P> = deserialize_data;
162162
unsafe {
@@ -186,17 +186,17 @@ pub fn content_register_serializer<
186186
P: Fn(&ContentSerializer, &mut Option<T>) + 'static,
187187
>(
188188
serializer: *mut ffi::GdkContentSerializer,
189-
) {
189+
) { unsafe {
190190
let serializer: ContentSerializer = from_glib_full(serializer);
191191
let callback: &P =
192192
&*(ffi::gdk_content_serializer_get_user_data(serializer.to_glib_none().0) as *mut _);
193193

194194
let mut task_data: *mut Option<T> =
195195
ffi::gdk_content_serializer_get_task_data(serializer.to_glib_none().0) as *mut _;
196196
if task_data.is_null() {
197-
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) {
197+
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) { unsafe {
198198
let _task_data: Box<Option<T>> = Box::from_raw(data as *mut _);
199-
}
199+
}}
200200
task_data = Box::into_raw(Box::new(None));
201201
ffi::gdk_content_serializer_set_task_data(
202202
serializer.to_glib_none().0,
@@ -206,16 +206,16 @@ pub fn content_register_serializer<
206206
}
207207

208208
(*callback)(&serializer, &mut *task_data);
209-
}
209+
}}
210210
let serialize = Some(serialize_func::<T, P> as _);
211211
unsafe extern "C" fn notify_func<
212212
T: 'static,
213213
P: Fn(&ContentSerializer, &mut Option<T>) + 'static,
214214
>(
215215
data: glib::ffi::gpointer,
216-
) {
216+
) { unsafe {
217217
let _callback: Box<P> = Box::from_raw(data as *mut _);
218-
}
218+
}}
219219
let destroy_call4 = Some(notify_func::<T, P> as _);
220220
let super_callback0: Box<P> = serialize_data;
221221
unsafe {
@@ -256,7 +256,7 @@ pub fn content_serialize_async<R: FnOnce(Result<(), glib::Error>) + 'static>(
256256
_source_object: *mut glib::gobject_ffi::GObject,
257257
res: *mut gio::ffi::GAsyncResult,
258258
user_data: glib::ffi::gpointer,
259-
) {
259+
) { unsafe {
260260
let mut error = ptr::null_mut();
261261
let _ = ffi::gdk_content_serialize_finish(res, &mut error);
262262
let result = if error.is_null() {
@@ -267,7 +267,7 @@ pub fn content_serialize_async<R: FnOnce(Result<(), glib::Error>) + 'static>(
267267
let callback: Box<glib::thread_guard::ThreadGuard<R>> = Box::from_raw(user_data as *mut _);
268268
let callback = callback.into_inner();
269269
callback(result);
270-
}
270+
}}
271271
let callback = content_serialize_async_trampoline::<R>;
272272
unsafe {
273273
ffi::gdk_content_serialize_async(

‎gdk4/src/gl_texture.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{ffi, GLContext, GLTexture};
1010
impl GLTexture {
1111
#[doc(alias = "gdk_gl_texture_new")]
1212
#[allow(clippy::missing_safety_doc)]
13-
pub unsafe fn new(context: &GLContext, id: u32, width: i32, height: i32) -> Self {
13+
pub unsafe fn new(context: &GLContext, id: u32, width: i32, height: i32) -> Self { unsafe {
1414
from_glib_full(ffi::gdk_gl_texture_new(
1515
context.to_glib_none().0,
1616
id,
@@ -19,7 +19,7 @@ impl GLTexture {
1919
None,
2020
std::ptr::null_mut(),
2121
))
22-
}
22+
}}
2323

2424
#[doc(alias = "gdk_gl_texture_new")]
2525
#[allow(clippy::missing_safety_doc)]
@@ -29,11 +29,11 @@ impl GLTexture {
2929
width: i32,
3030
height: i32,
3131
release_func: F,
32-
) -> Self {
33-
unsafe extern "C" fn destroy_closure<F: FnOnce() + 'static>(func: glib::ffi::gpointer) {
32+
) -> Self { unsafe {
33+
unsafe extern "C" fn destroy_closure<F: FnOnce() + 'static>(func: glib::ffi::gpointer) { unsafe {
3434
let released_func = Box::<F>::from_raw(func as *mut _);
3535
released_func();
36-
}
36+
}}
3737
let released_func = Box::new(release_func);
3838
from_glib_full(ffi::gdk_gl_texture_new(
3939
context.to_glib_none().0,
@@ -43,7 +43,7 @@ impl GLTexture {
4343
Some(destroy_closure::<F>),
4444
Box::into_raw(released_func) as glib::ffi::gpointer,
4545
))
46-
}
46+
}}
4747

4848
#[cfg(feature = "v4_12")]
4949
#[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]

0 commit comments

Comments
 (0)