Skip to content

Commit 257ac01

Browse files
jnboothjnbooth
committed
cxx-qt-gen: more test case fixes
1 parent 32533fb commit 257ac01

File tree

4 files changed

+63
-36
lines changed

4 files changed

+63
-36
lines changed

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

Lines changed: 15 additions & 8 deletions
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,7 +243,7 @@ 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<
246248
super::QObjectDisabledCxxQtSignalClosuresignal_disabled,
247249
>;
@@ -276,8 +278,9 @@ mod ffi {
276278
unsafe extern "C++" {
277279
#[doc(hidden)]
278280
#[namespace = "rust::cxxqtgen1"]
279-
type QObjectDisabledCxxQtSignalHandlersignal_enabled =
281+
type QObjectDisabledCxxQtSignalHandlersignal_enabled<'a> =
280282
cxx_qt::signalhandler::CxxQtSignalHandler<
283+
'a,
281284
super::QObjectDisabledCxxQtSignalClosuresignal_enabled,
282285
>;
283286
#[doc(hidden)]
@@ -365,8 +368,9 @@ mod ffi {
365368
unsafe extern "C++" {
366369
#[doc(hidden)]
367370
#[namespace = "rust::cxxqtgen1"]
368-
type QObjectExternEnabledCxxQtSignalHandlersignal_disabled1 =
371+
type QObjectExternEnabledCxxQtSignalHandlersignal_disabled1<'a> =
369372
cxx_qt::signalhandler::CxxQtSignalHandler<
373+
'a,
370374
super::QObjectExternEnabledCxxQtSignalClosuresignal_disabled1,
371375
>;
372376
#[doc(hidden)]
@@ -400,8 +404,9 @@ mod ffi {
400404
unsafe extern "C++" {
401405
#[doc(hidden)]
402406
#[namespace = "rust::cxxqtgen1"]
403-
type QObjectExternEnabledCxxQtSignalHandlersignal_enabled1 =
407+
type QObjectExternEnabledCxxQtSignalHandlersignal_enabled1<'a> =
404408
cxx_qt::signalhandler::CxxQtSignalHandler<
409+
'a,
405410
super::QObjectExternEnabledCxxQtSignalClosuresignal_enabled1,
406411
>;
407412
#[doc(hidden)]
@@ -453,8 +458,9 @@ mod ffi {
453458
unsafe extern "C++" {
454459
#[doc(hidden)]
455460
#[namespace = "rust::cxxqtgen1"]
456-
type QObjectExternDisabledCxxQtSignalHandlersignal_disabled2 =
461+
type QObjectExternDisabledCxxQtSignalHandlersignal_disabled2<'a> =
457462
cxx_qt::signalhandler::CxxQtSignalHandler<
463+
'a,
458464
super::QObjectExternDisabledCxxQtSignalClosuresignal_disabled2,
459465
>;
460466
#[doc(hidden)]
@@ -488,8 +494,9 @@ mod ffi {
488494
unsafe extern "C++" {
489495
#[doc(hidden)]
490496
#[namespace = "rust::cxxqtgen1"]
491-
type QObjectExternDisabledCxxQtSignalHandlersignal_enabled2 =
497+
type QObjectExternDisabledCxxQtSignalHandlersignal_enabled2<'a> =
492498
cxx_qt::signalhandler::CxxQtSignalHandler<
499+
'a,
493500
super::QObjectExternDisabledCxxQtSignalClosuresignal_enabled2,
494501
>;
495502
#[doc(hidden)]

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

Lines changed: 19 additions & 10 deletions
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,9 +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<
231-
super::SecondObjectCxxQtSignalClosurepropertyNameChanged,
232+
super::SecondObjectCxxQtSignalClosurepropertyNameChanged<'a>,
232233
>;
233234
#[doc(hidden)]
234235
#[namespace = "second_object::rust::cxxqtgen1"]
@@ -272,7 +273,10 @@ pub mod ffi {
272273
#[doc(hidden)]
273274
#[namespace = "second_object::rust::cxxqtgen1"]
274275
type SecondObjectCxxQtSignalHandlerready<'a> =
275-
cxx_qt::signalhandler::CxxQtSignalHandler<'a, super::SecondObjectCxxQtSignalClosureready>;
276+
cxx_qt::signalhandler::CxxQtSignalHandler<
277+
'a,
278+
super::SecondObjectCxxQtSignalClosureready,
279+
>;
276280
#[doc(hidden)]
277281
#[namespace = "second_object::rust::cxxqtgen1"]
278282
#[cxx_name = "SecondObject_readyConnect"]
@@ -410,7 +414,10 @@ pub mod ffi {
410414
#[doc(hidden)]
411415
#[namespace = "cxx_qt::multi_object::rust::cxxqtgen1"]
412416
type QPushButtonCxxQtSignalHandlerclicked<'a> =
413-
cxx_qt::signalhandler::CxxQtSignalHandler<'a, super::QPushButtonCxxQtSignalClosureclicked>;
417+
cxx_qt::signalhandler::CxxQtSignalHandler<
418+
'a,
419+
super::QPushButtonCxxQtSignalClosureclicked,
420+
>;
414421
#[doc(hidden)]
415422
#[namespace = "cxx_qt::multi_object::rust::cxxqtgen1"]
416423
#[cxx_name = "QPushButton_clickedConnect"]
@@ -439,10 +446,11 @@ pub mod ffi {
439446
unsafe extern "C++" {
440447
#[doc(hidden)]
441448
#[namespace = "mynamespace::rust::cxxqtgen1"]
442-
type ExternObjectCxxQtSignalHandlerdataReady<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
443-
'a,
444-
super::ExternObjectCxxQtSignalClosuredataReady,
445-
>;
449+
type ExternObjectCxxQtSignalHandlerdataReady<'a> =
450+
cxx_qt::signalhandler::CxxQtSignalHandler<
451+
'a,
452+
super::ExternObjectCxxQtSignalClosuredataReady,
453+
>;
446454
#[doc(hidden)]
447455
#[namespace = "mynamespace::rust::cxxqtgen1"]
448456
#[cxx_name = "ExternObjectCpp_dataReadyConnect"]
@@ -472,8 +480,9 @@ pub mod ffi {
472480
unsafe extern "C++" {
473481
#[doc(hidden)]
474482
#[namespace = "mynamespace::rust::cxxqtgen1"]
475-
type ExternObjectCxxQtSignalHandlererrorOccurred =
483+
type ExternObjectCxxQtSignalHandlererrorOccurred<'a> =
476484
cxx_qt::signalhandler::CxxQtSignalHandler<
485+
'a,
477486
super::ExternObjectCxxQtSignalClosureerrorOccurred,
478487
>;
479488
#[doc(hidden)]

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

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,11 @@ mod ffi {
146146
unsafe extern "C++" {
147147
#[doc(hidden)]
148148
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
149-
type MyObjectCxxQtSignalHandlerprimitiveChanged<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
150-
'a,
151-
super::MyObjectCxxQtSignalClosureprimitiveChanged,
152-
>;
149+
type MyObjectCxxQtSignalHandlerprimitiveChanged<'a> =
150+
cxx_qt::signalhandler::CxxQtSignalHandler<
151+
'a,
152+
super::MyObjectCxxQtSignalClosureprimitiveChanged,
153+
>;
153154
#[doc(hidden)]
154155
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
155156
#[cxx_name = "MyObject_primitiveChangedConnect"]
@@ -180,10 +181,11 @@ mod ffi {
180181
unsafe extern "C++" {
181182
#[doc(hidden)]
182183
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
183-
type MyObjectCxxQtSignalHandlertrivialChanged<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
184-
'a,
185-
super::MyObjectCxxQtSignalClosuretrivialChanged,
186-
>;
184+
type MyObjectCxxQtSignalHandlertrivialChanged<'a> =
185+
cxx_qt::signalhandler::CxxQtSignalHandler<
186+
'a,
187+
super::MyObjectCxxQtSignalClosuretrivialChanged,
188+
>;
187189
#[doc(hidden)]
188190
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
189191
#[cxx_name = "MyObject_trivialChangedConnect"]
@@ -214,8 +216,9 @@ mod ffi {
214216
unsafe extern "C++" {
215217
#[doc(hidden)]
216218
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
217-
type MyObjectCxxQtSignalHandlerpropAutoCxxNameChanged =
219+
type MyObjectCxxQtSignalHandlerpropAutoCxxNameChanged<'a> =
218220
cxx_qt::signalhandler::CxxQtSignalHandler<
221+
'a,
219222
super::MyObjectCxxQtSignalClosurepropAutoCxxNameChanged,
220223
>;
221224
#[doc(hidden)]
@@ -248,8 +251,9 @@ mod ffi {
248251
unsafe extern "C++" {
249252
#[doc(hidden)]
250253
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
251-
type MyObjectCxxQtSignalHandlercustomFunctionPropChanged =
254+
type MyObjectCxxQtSignalHandlercustomFunctionPropChanged<'a> =
252255
cxx_qt::signalhandler::CxxQtSignalHandler<
256+
'a,
253257
super::MyObjectCxxQtSignalClosurecustomFunctionPropChanged,
254258
>;
255259
#[doc(hidden)]
@@ -282,8 +286,9 @@ mod ffi {
282286
unsafe extern "C++" {
283287
#[doc(hidden)]
284288
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
285-
type MyObjectCxxQtSignalHandlerrenamedPropertyChanged =
289+
type MyObjectCxxQtSignalHandlerrenamedPropertyChanged<'a> =
286290
cxx_qt::signalhandler::CxxQtSignalHandler<
291+
'a,
287292
super::MyObjectCxxQtSignalClosurerenamedPropertyChanged,
288293
>;
289294
#[doc(hidden)]
@@ -316,8 +321,9 @@ mod ffi {
316321
unsafe extern "C++" {
317322
#[doc(hidden)]
318323
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
319-
type MyObjectCxxQtSignalHandlernamed_prop_2Changed =
324+
type MyObjectCxxQtSignalHandlernamed_prop_2Changed<'a> =
320325
cxx_qt::signalhandler::CxxQtSignalHandler<
326+
'a,
321327
super::MyObjectCxxQtSignalClosurenamed_prop_2Changed,
322328
>;
323329
#[doc(hidden)]
@@ -367,10 +373,11 @@ mod ffi {
367373
unsafe extern "C++" {
368374
#[doc(hidden)]
369375
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
370-
type MyObjectCxxQtSignalHandlermy_on_changed<'a> = cxx_qt::signalhandler::CxxQtSignalHandler<
371-
'a,
372-
super::MyObjectCxxQtSignalClosuremy_on_changed,
373-
>;
376+
type MyObjectCxxQtSignalHandlermy_on_changed<'a> =
377+
cxx_qt::signalhandler::CxxQtSignalHandler<
378+
'a,
379+
super::MyObjectCxxQtSignalClosuremy_on_changed,
380+
>;
374381
#[doc(hidden)]
375382
#[namespace = "cxx_qt::my_object::rust::cxxqtgen1"]
376383
#[cxx_name = "MyObject_my_on_changedConnect"]

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,9 @@ impl cxx_qt::signalhandler::CxxQtSignalHandlerClosure for MyObjectCxxQtSignalClo
348348
cxx::UniquePtr<ffi::Opaque>,
349349
ffi::QPoint,
350350
&ffi::QPoint,
351-
) + 'a + Send;
351+
)
352+
+ 'a
353+
+ Send;
352354
}
353355
use core::mem::drop as drop_MyObject_signal_handler_data_changed;
354356
fn call_MyObject_signal_handler_data_changed(
@@ -439,7 +441,9 @@ impl cxx_qt::signalhandler::CxxQtSignalHandlerClosure for MyObjectCxxQtSignalClo
439441
cxx::UniquePtr<ffi::Opaque>,
440442
ffi::QPoint,
441443
&'a ffi::QPoint,
442-
) + 'a + Send;
444+
)
445+
+ 'a
446+
+ Send;
443447
}
444448
use core::mem::drop as drop_MyObject_signal_handler_newData;
445449
fn call_MyObject_signal_handler_newData(

0 commit comments

Comments
 (0)