Skip to content

Commit 68e9a68

Browse files
A6GibKmA6GibKm
committed
Run cargo fmt
1 parent fde0bd4 commit 68e9a68

Some content is hidden

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

91 files changed

+3271
-2560
lines changed

‎gdk4/src/cairo_interaction.rs‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,22 @@ pub trait GdkCairoContextExt: sealed::Sealed {
4343
y: i32,
4444
width: i32,
4545
height: i32,
46-
) { unsafe {
47-
skip_assert_initialized!();
48-
ffi::gdk_cairo_draw_from_gl(
49-
self.to_raw(),
50-
surface.to_glib_none().0,
51-
source,
52-
source_type,
53-
buffer_scale,
54-
x,
55-
y,
56-
width,
57-
height,
58-
);
59-
}}
46+
) {
47+
unsafe {
48+
skip_assert_initialized!();
49+
ffi::gdk_cairo_draw_from_gl(
50+
self.to_raw(),
51+
surface.to_glib_none().0,
52+
source,
53+
source_type,
54+
buffer_scale,
55+
x,
56+
y,
57+
width,
58+
height,
59+
);
60+
}
61+
}
6062

6163
#[doc(alias = "gdk_cairo_set_source_rgba")]
6264
#[doc(alias = "set_source_rgba")]

‎gdk4/src/clipboard.rs‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,27 @@ impl Clipboard {
3333
_source_object: *mut glib::gobject_ffi::GObject,
3434
res: *mut gio::ffi::GAsyncResult,
3535
user_data: glib::ffi::gpointer,
36-
) { unsafe {
37-
let mut error = ptr::null_mut();
38-
let mut out_mime_type = ptr::null();
39-
let ret = ffi::gdk_clipboard_read_finish(
40-
_source_object as *mut _,
41-
res,
42-
&mut out_mime_type,
43-
&mut error,
44-
);
45-
let result = if error.is_null() {
46-
Ok((from_glib_full(ret), from_glib_none(out_mime_type)))
47-
} else {
48-
Err(from_glib_full(error))
49-
};
50-
let callback: Box<glib::thread_guard::ThreadGuard<Q>> =
51-
Box::from_raw(user_data as *mut _);
52-
let callback = callback.into_inner();
53-
callback(result);
54-
}}
36+
) {
37+
unsafe {
38+
let mut error = ptr::null_mut();
39+
let mut out_mime_type = ptr::null();
40+
let ret = ffi::gdk_clipboard_read_finish(
41+
_source_object as *mut _,
42+
res,
43+
&mut out_mime_type,
44+
&mut error,
45+
);
46+
let result = if error.is_null() {
47+
Ok((from_glib_full(ret), from_glib_none(out_mime_type)))
48+
} else {
49+
Err(from_glib_full(error))
50+
};
51+
let callback: Box<glib::thread_guard::ThreadGuard<Q>> =
52+
Box::from_raw(user_data as *mut _);
53+
let callback = callback.into_inner();
54+
callback(result);
55+
}
56+
}
5557
let callback = read_async_trampoline::<Q>;
5658
unsafe {
5759
ffi::gdk_clipboard_read_async(

‎gdk4/src/drop.rs‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,27 @@ impl Drop {
3333
_source_object: *mut glib::gobject_ffi::GObject,
3434
res: *mut gio::ffi::GAsyncResult,
3535
user_data: glib::ffi::gpointer,
36-
) { unsafe {
37-
let mut error = ptr::null_mut();
38-
let mut out_mime_type = ptr::null();
39-
let ret = ffi::gdk_drop_read_finish(
40-
_source_object as *mut _,
41-
res,
42-
&mut out_mime_type,
43-
&mut error,
44-
);
45-
let result = if error.is_null() {
46-
Ok((from_glib_full(ret), from_glib_none(out_mime_type)))
47-
} else {
48-
Err(from_glib_full(error))
49-
};
50-
let callback: Box<glib::thread_guard::ThreadGuard<Q>> =
51-
Box::from_raw(user_data as *mut _);
52-
let callback = callback.into_inner();
53-
callback(result);
54-
}}
36+
) {
37+
unsafe {
38+
let mut error = ptr::null_mut();
39+
let mut out_mime_type = ptr::null();
40+
let ret = ffi::gdk_drop_read_finish(
41+
_source_object as *mut _,
42+
res,
43+
&mut out_mime_type,
44+
&mut error,
45+
);
46+
let result = if error.is_null() {
47+
Ok((from_glib_full(ret), from_glib_none(out_mime_type)))
48+
} else {
49+
Err(from_glib_full(error))
50+
};
51+
let callback: Box<glib::thread_guard::ThreadGuard<Q>> =
52+
Box::from_raw(user_data as *mut _);
53+
let callback = callback.into_inner();
54+
callback(result);
55+
}
56+
}
5557
let callback = read_async_trampoline::<Q>;
5658
unsafe {
5759
ffi::gdk_drop_read_async(

‎gdk4/src/event.rs‎

Lines changed: 3 additions & 3 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 { unsafe {
170-
glib::translate::FromGlibPtrFull::from_glib_full(ptr as *mut $ffi_type)
171-
}}
169+
unsafe fn from_glib_full(ptr: *mut crate::ffi::GdkEvent) -> Self {
170+
unsafe { glib::translate::FromGlibPtrFull::from_glib_full(ptr as *mut $ffi_type) }
171+
}
172172
}
173173

174174
impl $rust_type {

‎gdk4/src/functions.rs‎

Lines changed: 91 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,23 @@ 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-
) { unsafe {
63-
let mut error = ptr::null_mut();
64-
let mut value = glib::Value::uninitialized();
65-
let _ = ffi::gdk_content_deserialize_finish(res, value.to_glib_none_mut().0, &mut error);
66-
let result = if error.is_null() {
67-
Ok(value)
68-
} else {
69-
Err(from_glib_full(error))
70-
};
71-
let callback: Box<glib::thread_guard::ThreadGuard<R>> = Box::from_raw(user_data as *mut _);
72-
let callback = callback.into_inner();
73-
callback(result);
74-
}}
62+
) {
63+
unsafe {
64+
let mut error = ptr::null_mut();
65+
let mut value = glib::Value::uninitialized();
66+
let _ =
67+
ffi::gdk_content_deserialize_finish(res, value.to_glib_none_mut().0, &mut error);
68+
let result = if error.is_null() {
69+
Ok(value)
70+
} else {
71+
Err(from_glib_full(error))
72+
};
73+
let callback: Box<glib::thread_guard::ThreadGuard<R>> =
74+
Box::from_raw(user_data as *mut _);
75+
let callback = callback.into_inner();
76+
callback(result);
77+
}
78+
}
7579
let callback = content_deserialize_async_trampoline::<R>;
7680
unsafe {
7781
ffi::gdk_content_deserialize_async(
@@ -126,37 +130,44 @@ pub fn content_register_deserializer<
126130
P: Fn(&ContentDeserializer, &mut Option<T>) + 'static,
127131
>(
128132
deserializer: *mut ffi::GdkContentDeserializer,
129-
) { unsafe {
130-
let deserializer: ContentDeserializer = from_glib_full(deserializer);
131-
let callback: &P =
132-
&*(ffi::gdk_content_deserializer_get_user_data(deserializer.to_glib_none().0)
133-
as *mut _);
133+
) {
134+
unsafe {
135+
let deserializer: ContentDeserializer = from_glib_full(deserializer);
136+
let callback: &P =
137+
&*(ffi::gdk_content_deserializer_get_user_data(deserializer.to_glib_none().0)
138+
as *mut _);
134139

135-
let mut task_data: *mut Option<T> =
136-
ffi::gdk_content_deserializer_get_task_data(deserializer.to_glib_none().0) as *mut _;
137-
if task_data.is_null() {
138-
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) { unsafe {
139-
let _task_data: Box<Option<T>> = Box::from_raw(data as *mut _);
140-
}}
141-
task_data = Box::into_raw(Box::new(None));
142-
ffi::gdk_content_deserializer_set_task_data(
143-
deserializer.to_glib_none().0,
144-
task_data as *mut _,
145-
Some(notify_func::<T>),
146-
);
147-
}
140+
let mut task_data: *mut Option<T> =
141+
ffi::gdk_content_deserializer_get_task_data(deserializer.to_glib_none().0)
142+
as *mut _;
143+
if task_data.is_null() {
144+
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) {
145+
unsafe {
146+
let _task_data: Box<Option<T>> = Box::from_raw(data as *mut _);
147+
}
148+
}
149+
task_data = Box::into_raw(Box::new(None));
150+
ffi::gdk_content_deserializer_set_task_data(
151+
deserializer.to_glib_none().0,
152+
task_data as *mut _,
153+
Some(notify_func::<T>),
154+
);
155+
}
148156

149-
(*callback)(&deserializer, &mut *task_data);
150-
}}
157+
(*callback)(&deserializer, &mut *task_data);
158+
}
159+
}
151160
let deserialize = Some(deserialize_func::<T, P> as _);
152161
unsafe extern "C" fn notify_func<
153162
T: 'static,
154163
P: Fn(&ContentDeserializer, &mut Option<T>) + 'static,
155164
>(
156165
data: glib::ffi::gpointer,
157-
) { unsafe {
158-
let _callback: Box<P> = Box::from_raw(data as *mut _);
159-
}}
166+
) {
167+
unsafe {
168+
let _callback: Box<P> = Box::from_raw(data as *mut _);
169+
}
170+
}
160171
let destroy_call4 = Some(notify_func::<T, P> as _);
161172
let super_callback0: Box<P> = deserialize_data;
162173
unsafe {
@@ -186,36 +197,43 @@ pub fn content_register_serializer<
186197
P: Fn(&ContentSerializer, &mut Option<T>) + 'static,
187198
>(
188199
serializer: *mut ffi::GdkContentSerializer,
189-
) { unsafe {
190-
let serializer: ContentSerializer = from_glib_full(serializer);
191-
let callback: &P =
192-
&*(ffi::gdk_content_serializer_get_user_data(serializer.to_glib_none().0) as *mut _);
200+
) {
201+
unsafe {
202+
let serializer: ContentSerializer = from_glib_full(serializer);
203+
let callback: &P =
204+
&*(ffi::gdk_content_serializer_get_user_data(serializer.to_glib_none().0)
205+
as *mut _);
193206

194-
let mut task_data: *mut Option<T> =
195-
ffi::gdk_content_serializer_get_task_data(serializer.to_glib_none().0) as *mut _;
196-
if task_data.is_null() {
197-
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) { unsafe {
198-
let _task_data: Box<Option<T>> = Box::from_raw(data as *mut _);
199-
}}
200-
task_data = Box::into_raw(Box::new(None));
201-
ffi::gdk_content_serializer_set_task_data(
202-
serializer.to_glib_none().0,
203-
task_data as *mut _,
204-
Some(notify_func::<T>),
205-
);
206-
}
207+
let mut task_data: *mut Option<T> =
208+
ffi::gdk_content_serializer_get_task_data(serializer.to_glib_none().0) as *mut _;
209+
if task_data.is_null() {
210+
unsafe extern "C" fn notify_func<T: 'static>(data: glib::ffi::gpointer) {
211+
unsafe {
212+
let _task_data: Box<Option<T>> = Box::from_raw(data as *mut _);
213+
}
214+
}
215+
task_data = Box::into_raw(Box::new(None));
216+
ffi::gdk_content_serializer_set_task_data(
217+
serializer.to_glib_none().0,
218+
task_data as *mut _,
219+
Some(notify_func::<T>),
220+
);
221+
}
207222

208-
(*callback)(&serializer, &mut *task_data);
209-
}}
223+
(*callback)(&serializer, &mut *task_data);
224+
}
225+
}
210226
let serialize = Some(serialize_func::<T, P> as _);
211227
unsafe extern "C" fn notify_func<
212228
T: 'static,
213229
P: Fn(&ContentSerializer, &mut Option<T>) + 'static,
214230
>(
215231
data: glib::ffi::gpointer,
216-
) { unsafe {
217-
let _callback: Box<P> = Box::from_raw(data as *mut _);
218-
}}
232+
) {
233+
unsafe {
234+
let _callback: Box<P> = Box::from_raw(data as *mut _);
235+
}
236+
}
219237
let destroy_call4 = Some(notify_func::<T, P> as _);
220238
let super_callback0: Box<P> = serialize_data;
221239
unsafe {
@@ -256,18 +274,21 @@ pub fn content_serialize_async<R: FnOnce(Result<(), glib::Error>) + 'static>(
256274
_source_object: *mut glib::gobject_ffi::GObject,
257275
res: *mut gio::ffi::GAsyncResult,
258276
user_data: glib::ffi::gpointer,
259-
) { unsafe {
260-
let mut error = ptr::null_mut();
261-
let _ = ffi::gdk_content_serialize_finish(res, &mut error);
262-
let result = if error.is_null() {
263-
Ok(())
264-
} else {
265-
Err(from_glib_full(error))
266-
};
267-
let callback: Box<glib::thread_guard::ThreadGuard<R>> = Box::from_raw(user_data as *mut _);
268-
let callback = callback.into_inner();
269-
callback(result);
270-
}}
277+
) {
278+
unsafe {
279+
let mut error = ptr::null_mut();
280+
let _ = ffi::gdk_content_serialize_finish(res, &mut error);
281+
let result = if error.is_null() {
282+
Ok(())
283+
} else {
284+
Err(from_glib_full(error))
285+
};
286+
let callback: Box<glib::thread_guard::ThreadGuard<R>> =
287+
Box::from_raw(user_data as *mut _);
288+
let callback = callback.into_inner();
289+
callback(result);
290+
}
291+
}
271292
let callback = content_serialize_async_trampoline::<R>;
272293
unsafe {
273294
ffi::gdk_content_serialize_async(

0 commit comments

Comments
 (0)