Skip to content

Commit 715e129

Browse files
jnboothjnbooth
committed
cxx-qt-gen: fix test cases
1 parent 065d61b commit 715e129

File tree

5 files changed

+67
-35
lines changed

5 files changed

+67
-35
lines changed

‎crates/cxx-qt-gen/src/generator/rust/signals.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ mod tests {
616616
unsafe extern "C++" {
617617
#[doc(hidden)]
618618
#[namespace = "rust::cxxqtgen1"]
619-
type MyObjectCxxQtSignalHandlerunsafeSignal<'s> = cxx_qt::signalhandler::CxxQtSignalHandler<'a, super::MyObjectCxxQtSignalClosureunsafeSignal>;
619+
type MyObjectCxxQtSignalHandlerunsafeSignal<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<'a, super::MyObjectCxxQtSignalClosureunsafeSignal>;
620620

621621
#[doc(hidden)]
622622
#[namespace = "rust::cxxqtgen1"]

‎crates/cxx-qt-gen/test_outputs/cfgs.rs

+16-8
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ mod ffi {
9999
unsafe extern "C++" {
100100
#[doc(hidden)]
101101
#[namespace = "rust::cxxqtgen1"]
102-
type QObjectEnabledCxxQtSignalHandlersignal_disabled =
102+
type QObjectEnabledCxxQtSignalHandlersignal_disabled<'a> =
103103
cxx_qt::signalhandler::CxxQtSignalHandler<
104+
'a,
104105
super::QObjectEnabledCxxQtSignalClosuresignal_disabled,
105106
>;
106107
#[doc(hidden)]
@@ -134,8 +135,9 @@ mod ffi {
134135
unsafe extern "C++" {
135136
#[doc(hidden)]
136137
#[namespace = "rust::cxxqtgen1"]
137-
type QObjectEnabledCxxQtSignalHandlersignal_enabled =
138+
type QObjectEnabledCxxQtSignalHandlersignal_enabled<'a> =
138139
cxx_qt::signalhandler::CxxQtSignalHandler<
140+
'a,
139141
super::QObjectEnabledCxxQtSignalClosuresignal_enabled,
140142
>;
141143
#[doc(hidden)]
@@ -241,8 +243,9 @@ mod ffi {
241243
unsafe extern "C++" {
242244
#[doc(hidden)]
243245
#[namespace = "rust::cxxqtgen1"]
244-
type QObjectDisabledCxxQtSignalHandlersignal_disabled =
246+
type QObjectDisabledCxxQtSignalHandlersignal_disabled<'a> =
245247
cxx_qt::signalhandler::CxxQtSignalHandler<
248+
'a,
246249
super::QObjectDisabledCxxQtSignalClosuresignal_disabled,
247250
>;
248251
#[doc(hidden)]
@@ -276,8 +279,9 @@ mod ffi {
276279
unsafe extern "C++" {
277280
#[doc(hidden)]
278281
#[namespace = "rust::cxxqtgen1"]
279-
type QObjectDisabledCxxQtSignalHandlersignal_enabled =
282+
type QObjectDisabledCxxQtSignalHandlersignal_enabled<'a> =
280283
cxx_qt::signalhandler::CxxQtSignalHandler<
284+
'a,
281285
super::QObjectDisabledCxxQtSignalClosuresignal_enabled,
282286
>;
283287
#[doc(hidden)]
@@ -365,8 +369,9 @@ mod ffi {
365369
unsafe extern "C++" {
366370
#[doc(hidden)]
367371
#[namespace = "rust::cxxqtgen1"]
368-
type QObjectExternEnabledCxxQtSignalHandlersignal_disabled1 =
372+
type QObjectExternEnabledCxxQtSignalHandlersignal_disabled1<'a> =
369373
cxx_qt::signalhandler::CxxQtSignalHandler<
374+
'a,
370375
super::QObjectExternEnabledCxxQtSignalClosuresignal_disabled1,
371376
>;
372377
#[doc(hidden)]
@@ -400,8 +405,9 @@ mod ffi {
400405
unsafe extern "C++" {
401406
#[doc(hidden)]
402407
#[namespace = "rust::cxxqtgen1"]
403-
type QObjectExternEnabledCxxQtSignalHandlersignal_enabled1 =
408+
type QObjectExternEnabledCxxQtSignalHandlersignal_enabled1<'a> =
404409
cxx_qt::signalhandler::CxxQtSignalHandler<
410+
'a,
405411
super::QObjectExternEnabledCxxQtSignalClosuresignal_enabled1,
406412
>;
407413
#[doc(hidden)]
@@ -453,8 +459,9 @@ mod ffi {
453459
unsafe extern "C++" {
454460
#[doc(hidden)]
455461
#[namespace = "rust::cxxqtgen1"]
456-
type QObjectExternDisabledCxxQtSignalHandlersignal_disabled2 =
462+
type QObjectExternDisabledCxxQtSignalHandlersignal_disabled2<'a> =
457463
cxx_qt::signalhandler::CxxQtSignalHandler<
464+
'a,
458465
super::QObjectExternDisabledCxxQtSignalClosuresignal_disabled2,
459466
>;
460467
#[doc(hidden)]
@@ -488,8 +495,9 @@ mod ffi {
488495
unsafe extern "C++" {
489496
#[doc(hidden)]
490497
#[namespace = "rust::cxxqtgen1"]
491-
type QObjectExternDisabledCxxQtSignalHandlersignal_enabled2 =
498+
type QObjectExternDisabledCxxQtSignalHandlersignal_enabled2<'a> =
492499
cxx_qt::signalhandler::CxxQtSignalHandler<
500+
'a,
493501
super::QObjectExternDisabledCxxQtSignalClosuresignal_enabled2,
494502
>;
495503
#[doc(hidden)]

‎crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs

+19-10
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ pub mod ffi {
105105
unsafe extern "C++" {
106106
#[doc(hidden)]
107107
#[namespace = "cxx_qt::multi_object::rust::cxxqtgen1"]
108-
type MyObjectCxxQtSignalHandlerpropertyNameChanged =
108+
type MyObjectCxxQtSignalHandlerpropertyNameChanged<'a> =
109109
cxx_qt::signalhandler::CxxQtSignalHandler<
110+
'a,
110111
super::MyObjectCxxQtSignalClosurepropertyNameChanged,
111112
>;
112113
#[doc(hidden)]
@@ -226,8 +227,9 @@ pub mod ffi {
226227
unsafe extern "C++" {
227228
#[doc(hidden)]
228229
#[namespace = "second_object::rust::cxxqtgen1"]
229-
type SecondObjectCxxQtSignalHandlerpropertyNameChanged =
230+
type SecondObjectCxxQtSignalHandlerpropertyNameChanged<'a> =
230231
cxx_qt::signalhandler::CxxQtSignalHandler<
232+
'a,
231233
super::SecondObjectCxxQtSignalClosurepropertyNameChanged,
232234
>;
233235
#[doc(hidden)]
@@ -271,8 +273,10 @@ pub mod ffi {
271273
unsafe extern "C++" {
272274
#[doc(hidden)]
273275
#[namespace = "second_object::rust::cxxqtgen1"]
274-
type SecondObjectCxxQtSignalHandlerready<'a> =
275-
cxx_qt::signalhandler::CxxQtSignalHandler<'a, super::SecondObjectCxxQtSignalClosureready>;
276+
type SecondObjectCxxQtSignalHandlerready<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
277+
'a,
278+
super::SecondObjectCxxQtSignalClosureready,
279+
>;
276280
#[doc(hidden)]
277281
#[namespace = "second_object::rust::cxxqtgen1"]
278282
#[cxx_name = "SecondObject_readyConnect"]
@@ -409,8 +413,10 @@ pub mod ffi {
409413
unsafe extern "C++" {
410414
#[doc(hidden)]
411415
#[namespace = "cxx_qt::multi_object::rust::cxxqtgen1"]
412-
type QPushButtonCxxQtSignalHandlerclicked<'a> =
413-
cxx_qt::signalhandler::CxxQtSignalHandler<'a, super::QPushButtonCxxQtSignalClosureclicked>;
416+
type QPushButtonCxxQtSignalHandlerclicked<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
417+
'a,
418+
super::QPushButtonCxxQtSignalClosureclicked,
419+
>;
414420
#[doc(hidden)]
415421
#[namespace = "cxx_qt::multi_object::rust::cxxqtgen1"]
416422
#[cxx_name = "QPushButton_clickedConnect"]
@@ -439,9 +445,11 @@ pub mod ffi {
439445
unsafe extern "C++" {
440446
#[doc(hidden)]
441447
#[namespace = "mynamespace::rust::cxxqtgen1"]
442-
type ExternObjectCxxQtSignalHandlerdataReady = cxx_qt::signalhandler::CxxQtSignalHandler<
443-
super::ExternObjectCxxQtSignalClosuredataReady,
444-
>;
448+
type ExternObjectCxxQtSignalHandlerdataReady<'a> =
449+
cxx_qt::signalhandler::CxxQtSignalHandler<
450+
'a,
451+
super::ExternObjectCxxQtSignalClosuredataReady,
452+
>;
445453
#[doc(hidden)]
446454
#[namespace = "mynamespace::rust::cxxqtgen1"]
447455
#[cxx_name = "ExternObjectCpp_dataReadyConnect"]
@@ -471,8 +479,9 @@ pub mod ffi {
471479
unsafe extern "C++" {
472480
#[doc(hidden)]
473481
#[namespace = "mynamespace::rust::cxxqtgen1"]
474-
type ExternObjectCxxQtSignalHandlererrorOccurred =
482+
type ExternObjectCxxQtSignalHandlererrorOccurred<'a> =
475483
cxx_qt::signalhandler::CxxQtSignalHandler<
484+
'a,
476485
super::ExternObjectCxxQtSignalClosureerrorOccurred,
477486
>;
478487
#[doc(hidden)]

‎crates/cxx-qt-gen/test_outputs/properties.rs

+23-13
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,11 @@ mod ffi {
146146
unsafe extern "C++" {
147147
#[doc(hidden)]
148148
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
149-
type MyObjectCxxQtSignalHandlerprimitiveChanged = cxx_qt::signalhandler::CxxQtSignalHandler<
150-
super::MyObjectCxxQtSignalClosureprimitiveChanged,
151-
>;
149+
type MyObjectCxxQtSignalHandlerprimitiveChanged<'a> =
150+
cxx_qt::signalhandler::CxxQtSignalHandler<
151+
'a,
152+
super::MyObjectCxxQtSignalClosureprimitiveChanged,
153+
>;
152154
#[doc(hidden)]
153155
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
154156
#[cxx_name = "MyObject_primitiveChangedConnect"]
@@ -179,9 +181,11 @@ mod ffi {
179181
unsafe extern "C++" {
180182
#[doc(hidden)]
181183
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
182-
type MyObjectCxxQtSignalHandlertrivialChanged = cxx_qt::signalhandler::CxxQtSignalHandler<
183-
super::MyObjectCxxQtSignalClosuretrivialChanged,
184-
>;
184+
type MyObjectCxxQtSignalHandlertrivialChanged<'a> =
185+
cxx_qt::signalhandler::CxxQtSignalHandler<
186+
'a,
187+
super::MyObjectCxxQtSignalClosuretrivialChanged,
188+
>;
185189
#[doc(hidden)]
186190
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
187191
#[cxx_name = "MyObject_trivialChangedConnect"]
@@ -212,8 +216,9 @@ mod ffi {
212216
unsafe extern "C++" {
213217
#[doc(hidden)]
214218
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
215-
type MyObjectCxxQtSignalHandlerpropAutoCxxNameChanged =
219+
type MyObjectCxxQtSignalHandlerpropAutoCxxNameChanged<'a> =
216220
cxx_qt::signalhandler::CxxQtSignalHandler<
221+
'a,
217222
super::MyObjectCxxQtSignalClosurepropAutoCxxNameChanged,
218223
>;
219224
#[doc(hidden)]
@@ -246,8 +251,9 @@ mod ffi {
246251
unsafe extern "C++" {
247252
#[doc(hidden)]
248253
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
249-
type MyObjectCxxQtSignalHandlercustomFunctionPropChanged =
254+
type MyObjectCxxQtSignalHandlercustomFunctionPropChanged<'a> =
250255
cxx_qt::signalhandler::CxxQtSignalHandler<
256+
'a,
251257
super::MyObjectCxxQtSignalClosurecustomFunctionPropChanged,
252258
>;
253259
#[doc(hidden)]
@@ -280,8 +286,9 @@ mod ffi {
280286
unsafe extern "C++" {
281287
#[doc(hidden)]
282288
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
283-
type MyObjectCxxQtSignalHandlerrenamedPropertyChanged =
289+
type MyObjectCxxQtSignalHandlerrenamedPropertyChanged<'a> =
284290
cxx_qt::signalhandler::CxxQtSignalHandler<
291+
'a,
285292
super::MyObjectCxxQtSignalClosurerenamedPropertyChanged,
286293
>;
287294
#[doc(hidden)]
@@ -314,8 +321,9 @@ mod ffi {
314321
unsafe extern "C++" {
315322
#[doc(hidden)]
316323
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
317-
type MyObjectCxxQtSignalHandlernamed_prop_2Changed =
324+
type MyObjectCxxQtSignalHandlernamed_prop_2Changed<'a> =
318325
cxx_qt::signalhandler::CxxQtSignalHandler<
326+
'a,
319327
super::MyObjectCxxQtSignalClosurenamed_prop_2Changed,
320328
>;
321329
#[doc(hidden)]
@@ -365,9 +373,11 @@ mod ffi {
365373
unsafe extern "C++" {
366374
#[doc(hidden)]
367375
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
368-
type MyObjectCxxQtSignalHandlermy_on_changed = cxx_qt::signalhandler::CxxQtSignalHandler<
369-
super::MyObjectCxxQtSignalClosuremy_on_changed,
370-
>;
376+
type MyObjectCxxQtSignalHandlermy_on_changed<'a> =
377+
cxx_qt::signalhandler::CxxQtSignalHandler<
378+
'a,
379+
super::MyObjectCxxQtSignalClosuremy_on_changed,
380+
>;
371381
#[doc(hidden)]
372382
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
373383
#[cxx_name = "MyObject_my_on_changedConnect"]

‎crates/cxx-qt-gen/test_outputs/signals.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ mod ffi {
8787
unsafe extern "C++" {
8888
#[doc(hidden)]
8989
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
90-
type MyObjectCxxQtSignalHandlerdata_changed = cxx_qt::signalhandler::CxxQtSignalHandler<
90+
type MyObjectCxxQtSignalHandlerdata_changed<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
91+
'a,
9192
super::MyObjectCxxQtSignalClosuredata_changed,
9293
>;
9394
#[doc(hidden)]
@@ -347,7 +348,9 @@ impl cxx_qt::signalhandler::CxxQtSignalHandlerClosure for MyObjectCxxQtSignalClo
347348
cxx::UniquePtr<ffi::Opaque>,
348349
ffi::QPoint,
349350
&ffi::QPoint,
350-
) + 'a + Send;
351+
)
352+
+ 'a
353+
+ Send;
351354
}
352355
use core::mem::drop as drop_MyObject_signal_handler_data_changed;
353356
fn call_MyObject_signal_handler_data_changed(
@@ -438,7 +441,9 @@ impl cxx_qt::signalhandler::CxxQtSignalHandlerClosure for MyObjectCxxQtSignalClo
438441
cxx::UniquePtr<ffi::Opaque>,
439442
ffi::QPoint,
440443
&'a ffi::QPoint,
441-
) + 'a + Send;
444+
)
445+
+ 'a
446+
+ Send;
442447
}
443448
use core::mem::drop as drop_MyObject_signal_handler_newData;
444449
fn call_MyObject_signal_handler_newData(

0 commit comments

Comments
 (0)