Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit a84e188

Browse files
ids1024ids1024
committed
Remove optional $rust_class_name from glib_wrapper
Crate users who want to access this can use `glib::Class<T>`.
1 parent 28bd645 commit a84e188

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

‎glib/src/wrapper.rs

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -329,156 +329,144 @@ macro_rules! glib_wrapper {
329329
// Object, no class struct, no parents or interfaces
330330
(
331331
$(#[$attr:meta])*
332-
pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>);
332+
pub struct $name:ident(Object<$ffi_name:ty>);
333333

334334
match fn {
335335
get_type => || $get_type_expr:expr,
336336
}
337337
) => {
338338
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void, @get_type $get_type_expr, @extends [], @implements []);
339-
$( pub type $rust_class_name = $crate::Class<$name>; )?
340339
};
341340

342341
// Object, class struct, no parents or interfaces
343342
(
344343
$(#[$attr:meta])*
345-
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>);
344+
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>);
346345

347346
match fn {
348347
get_type => || $get_type_expr:expr,
349348
}
350349
) => {
351350
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name, @get_type $get_type_expr, @extends [], @implements []);
352-
$( pub type $rust_class_name = $crate::Class<$name>; )?
353351
};
354352

355353
// Object, no class struct, parents, no interfaces
356354
(
357355
$(#[$attr:meta])*
358-
pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+;
356+
pub struct $name:ident(Object<$ffi_name:ty>) @extends $($extends:path),+;
359357

360358
match fn {
361359
get_type => || $get_type_expr:expr,
362360
}
363361
) => {
364362
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void,
365363
@get_type $get_type_expr, @extends [$($extends),+], @implements []);
366-
$( pub type $rust_class_name = $crate::Class<$name>; )?
367364
};
368365

369366
// Object, class struct, parents, no interfaces
370367
(
371368
$(#[$attr:meta])*
372-
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+;
369+
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>) @extends $($extends:path),+;
373370

374371
match fn {
375372
get_type => || $get_type_expr:expr,
376373
}
377374
) => {
378375
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name,
379376
@get_type $get_type_expr, @extends [$($extends),+], @implements []);
380-
$( pub type $rust_class_name = $crate::Class<$name>; )?
381377
};
382378

383379
// Object, no class struct, no parents, interfaces
384380
(
385381
$(#[$attr:meta])*
386-
pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>) @implements $($implements:path),+;
382+
pub struct $name:ident(Object<$ffi_name:ty>) @implements $($implements:path),+;
387383

388384
match fn {
389385
get_type => || $get_type_expr:expr,
390386
}
391387
) => {
392388
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void,
393389
@get_type $get_type_expr, @extends [], @implements [$($implements),+]);
394-
$( pub type $rust_class_name = $crate::Class<$name>; )?
395390
};
396391

397392
// Object, class struct, no parents, interfaces
398393
(
399394
$(#[$attr:meta])*
400-
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>) @implements $($implements:path),+;
395+
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>) @implements $($implements:path),+;
401396

402397
match fn {
403398
get_type => || $get_type_expr:expr,
404399
}
405400
) => {
406401
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name,
407402
@get_type $get_type_expr, @extends [], @implements [$($implements),+]);
408-
$( pub type $rust_class_name = $crate::Class<$name>; )?
409403
};
410404

411405
// Object, no class struct, parents and interfaces
412406
(
413407
$(#[$attr:meta])*
414-
pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+, @implements $($implements:path),+;
408+
pub struct $name:ident(Object<$ffi_name:ty>) @extends $($extends:path),+, @implements $($implements:path),+;
415409

416410
match fn {
417411
get_type => || $get_type_expr:expr,
418412
}
419413
) => {
420414
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void,
421415
@get_type $get_type_expr, @extends [$($extends),+], @implements [$($implements),+]);
422-
$( pub type $rust_class_name = $crate::Class<$name>; )?
423416
};
424417

425418
// Object, class struct, parents and interfaces
426419
(
427420
$(#[$attr:meta])*
428-
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+, @implements $($implements:path),+;
421+
pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>) @extends $($extends:path),+, @implements $($implements:path),+;
429422

430423
match fn {
431424
get_type => || $get_type_expr:expr,
432425
}
433426
) => {
434427
$crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name,
435428
@get_type $get_type_expr, @extends [$($extends),+], @implements [$($implements),+]);
436-
$( pub type $rust_class_name = $crate::Class<$name>; )?
437429
};
438430

439431
// ObjectSubclass, no parents or interfaces
440432
(
441433
$(#[$attr:meta])*
442-
pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>);
434+
pub struct $name:ident(ObjectSubclass<$subclass:ty>);
443435
) => {
444436
use glib::translate::ToGlib;
445437
$crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
446438
@get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
447439
@extends [], @implements []);
448-
$( pub type $rust_class_name = $crate::Class<$name>; )?
449440
};
450441

451442
// ObjectSubclass, no parents, interfaces
452443
(
453444
$(#[$attr:meta])*
454-
pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>) @implements $($implements:path),+;
445+
pub struct $name:ident(ObjectSubclass<$subclass:ty>) @implements $($implements:path),+;
455446
) => {
456447
$crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
457448
@get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
458449
@extends [], @implements [$($implements),+]);
459-
$( pub type $rust_class_name = $crate::Class<$name>; )?
460450
};
461451

462452
// ObjectSubclass, parents, no interfaces
463453
(
464454
$(#[$attr:meta])*
465-
pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+;
455+
pub struct $name:ident(ObjectSubclass<$subclass:ty>) @extends $($extends:path),+;
466456
) => {
467457
$crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
468458
@get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
469459
@extends [$($extends),+], @implements []);
470-
$( pub type $rust_class_name = $crate::Class<$name>; )?
471460
};
472461

473462
// ObjectSubclass, parents and interfaces
474463
(
475464
$(#[$attr:meta])*
476-
pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+, @implements $($implements:path),+;
465+
pub struct $name:ident(ObjectSubclass<$subclass:ty>) @extends $($extends:path),+, @implements $($implements:path),+;
477466
) => {
478467
$crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
479468
@get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
480469
@extends [$($extends),+], @implements [$($implements),+]);
481-
$( pub type $rust_class_name = $crate::Class<$name>; )?
482470
};
483471

484472
// Interface, no prerequisites

0 commit comments

Comments
 (0)