@@ -180,7 +180,7 @@ macro_rules! glib_boxed_inline_wrapper {
180
180
}
181
181
182
182
#[ doc( hidden) ]
183
- impl <' a $( , $( $generic $ ( : $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibPtr <' a, * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
183
+ impl <' a $( , $( $generic: ' a + $ ( $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibPtr <' a, * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
184
184
type Storage = & ' a Self ;
185
185
186
186
#[ inline]
@@ -198,7 +198,7 @@ macro_rules! glib_boxed_inline_wrapper {
198
198
}
199
199
200
200
#[ doc( hidden) ]
201
- impl <' a $( , $( $generic $ ( : $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibPtrMut <' a, * mut $ffi_name> for $name $( <$( $generic) ,+>) ? {
201
+ impl <' a $( , $( $generic: ' a + $ ( $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibPtrMut <' a, * mut $ffi_name> for $name $( <$( $generic) ,+>) ? {
202
202
type Storage = & ' a mut Self ;
203
203
204
204
#[ inline]
@@ -209,7 +209,7 @@ macro_rules! glib_boxed_inline_wrapper {
209
209
}
210
210
211
211
#[ doc( hidden) ]
212
- impl <' a $( , $( $generic $ ( : $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * mut * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
212
+ impl <' a $( , $( $generic: ' a + $ ( $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * mut * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
213
213
type Storage = Option <Vec <* const $ffi_name>>;
214
214
215
215
fn to_glib_none_from_slice( t: & ' a [ Self ] ) -> ( * mut * const $ffi_name, Self :: Storage ) {
@@ -247,7 +247,7 @@ macro_rules! glib_boxed_inline_wrapper {
247
247
}
248
248
249
249
#[ doc( hidden) ]
250
- impl <' a $( , $( $generic $ ( : $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * const * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
250
+ impl <' a $( , $( $generic: ' a + $ ( $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * const * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
251
251
type Storage = Option <Vec <* const $ffi_name>>;
252
252
253
253
fn to_glib_none_from_slice( t: & ' a [ Self ] ) -> ( * const * const $ffi_name, Self :: Storage ) {
@@ -267,7 +267,7 @@ macro_rules! glib_boxed_inline_wrapper {
267
267
}
268
268
269
269
#[ doc( hidden) ]
270
- impl <' a $( , $( $generic $ ( : $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * mut $ffi_name> for $name $( <$( $generic) ,+>) ? {
270
+ impl <' a $( , $( $generic: ' a + $ ( $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * mut $ffi_name> for $name $( <$( $generic) ,+>) ? {
271
271
type Storage = Option <& ' a [ Self ] >;
272
272
273
273
fn to_glib_none_from_slice( t: & ' a [ Self ] ) -> ( * mut $ffi_name, Self :: Storage ) {
@@ -298,7 +298,7 @@ macro_rules! glib_boxed_inline_wrapper {
298
298
}
299
299
300
300
#[ doc( hidden) ]
301
- impl <' a $( , $( $generic $ ( : $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
301
+ impl <' a $( , $( $generic: ' a $ ( $bound $( + $bound2) * ) ?) ,+) ?> $crate:: translate:: ToGlibContainerFromSlice <' a, * const $ffi_name> for $name $( <$( $generic) ,+>) ? {
302
302
type Storage = Option <& ' a [ Self ] >;
303
303
304
304
fn to_glib_none_from_slice( t: & ' a [ Self ] ) -> ( * const $ffi_name, Self :: Storage ) {
@@ -427,7 +427,7 @@ macro_rules! glib_boxed_inline_wrapper {
427
427
428
428
let mut res = Vec :: with_capacity( num) ;
429
429
for i in 0 ..num {
430
- res. push( std:: ptr:: read( ptr. add( i) as * const $name) ) ;
430
+ res. push( std:: ptr:: read( ptr. add( i) as * const $name $ ( <$ ( $generic ) ,+> ) ? ) ) ;
431
431
}
432
432
$crate:: ffi:: g_free( ptr as * mut _) ;
433
433
res
@@ -495,26 +495,26 @@ macro_rules! glib_boxed_inline_wrapper {
495
495
}
496
496
497
497
#[ doc( hidden) ]
498
- impl $( <$( $generic $ ( : $bound $( + $bound2) * ) ?) ,+>) ? $crate:: value:: ValueType for $name $( <$( $generic) ,+>) ? {
498
+ impl $( <$( $generic: ' static + $ ( $bound $( + $bound2) * ) ?) ,+>) ? $crate:: value:: ValueType for $name $( <$( $generic) ,+>) ? {
499
499
type Type = Self ;
500
500
}
501
501
502
502
#[ doc( hidden) ]
503
- unsafe impl < ' a> $crate:: value:: FromValue <' a > for $name $( <$( $generic) ,+>) ? {
503
+ unsafe impl $ ( <$ ( $generic $ ( : $bound $ ( + $bound2 ) * ) ? ) ,+> ) ? $crate:: value:: FromValue <' _ > for $name $( <$( $generic) ,+>) ? {
504
504
type Checker = $crate:: value:: GenericValueTypeOrNoneChecker <Self >;
505
505
506
- unsafe fn from_value( value: & ' a $crate:: Value ) -> Self {
506
+ unsafe fn from_value( value: & ' _ $crate:: Value ) -> Self {
507
507
let ptr = $crate:: gobject_ffi:: g_value_get_boxed( $crate:: translate:: ToGlibPtr :: to_glib_none( value) . 0 ) ;
508
508
assert!( !ptr. is_null( ) ) ;
509
509
<Self as $crate:: translate:: FromGlibPtrNone <* const $ffi_name>>:: from_glib_none( ptr as * const $ffi_name)
510
510
}
511
511
}
512
512
513
513
#[ doc( hidden) ]
514
- unsafe impl < ' a> $crate:: value:: FromValue <' a > for & ' a $name $( <$( $generic) ,+>) ? {
514
+ unsafe impl $ ( <$ ( $generic $ ( : $bound $ ( + $bound2 ) * ) ? ) ,+> ) ? $crate:: value:: FromValue <' _ > for & ' _ $name $( <$( $generic) ,+>) ? {
515
515
type Checker = $crate:: value:: GenericValueTypeOrNoneChecker <Self >;
516
516
517
- unsafe fn from_value( value: & ' a $crate:: Value ) -> Self {
517
+ unsafe fn from_value( value: & ' _ $crate:: Value ) -> Self {
518
518
let ptr = $crate:: gobject_ffi:: g_value_get_boxed( $crate:: translate:: ToGlibPtr :: to_glib_none( value) . 0 ) ;
519
519
assert!( !ptr. is_null( ) ) ;
520
520
& * ( ptr as * const $ffi_name as * const $name $( <$( $generic) ,+>) ?)
@@ -540,7 +540,7 @@ macro_rules! glib_boxed_inline_wrapper {
540
540
}
541
541
542
542
#[ doc( hidden) ]
543
- impl $( <$( $generic $ ( : $bound $( + $bound2) * ) ?) ,+>) ? $crate:: value:: ToValueOptional for $name $( <$( $generic) ,+>) ? {
543
+ impl $( <$( $generic: ' static + $ ( $bound $( + $bound2) * ) ?) ,+>) ? $crate:: value:: ToValueOptional for $name $( <$( $generic) ,+>) ? {
544
544
fn to_value_optional( s: Option <& Self >) -> $crate:: Value {
545
545
let mut value = $crate:: Value :: for_value_type:: <Self >( ) ;
546
546
unsafe {
0 commit comments