Remove optional $rust_class_name argument from glib_wrapper!

atk/src/auto/gobject_accessible.rs

@@ -10,7 +10,7 @@ use std::fmt;
 use Object;
 
 glib_wrapper! {
-    pub struct GObjectAccessible(Object<atk_sys::AtkGObjectAccessible, atk_sys::AtkGObjectAccessibleClass, GObjectAccessibleClass>) @extends Object;
+    pub struct GObjectAccessible(Object<atk_sys::AtkGObjectAccessible, atk_sys::AtkGObjectAccessibleClass>) @extends Object;
 
     match fn {
         get_type => || atk_sys::atk_gobject_accessible_get_type(),

atk/src/auto/hyperlink.rs

@@ -20,7 +20,7 @@ use Action;
 use Object;
 
 glib_wrapper! {
-    pub struct Hyperlink(Object<atk_sys::AtkHyperlink, atk_sys::AtkHyperlinkClass, HyperlinkClass>) @implements Action;
+    pub struct Hyperlink(Object<atk_sys::AtkHyperlink, atk_sys::AtkHyperlinkClass>) @implements Action;
 
     match fn {
         get_type => || atk_sys::atk_hyperlink_get_type(),

atk/src/auto/misc.rs

@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct Misc(Object<atk_sys::AtkMisc, atk_sys::AtkMiscClass, MiscClass>);
+    pub struct Misc(Object<atk_sys::AtkMisc, atk_sys::AtkMiscClass>);
 
     match fn {
         get_type => || atk_sys::atk_misc_get_type(),

atk/src/auto/mod.rs

@@ -20,13 +20,11 @@ pub use self::editable_text::{EditableText, NONE_EDITABLE_TEXT};
 
 mod gobject_accessible;
 pub use self::gobject_accessible::GObjectAccessibleExt;
-pub use self::gobject_accessible::{
-    GObjectAccessible, GObjectAccessibleClass, NONE_GOBJECT_ACCESSIBLE,
-};
+pub use self::gobject_accessible::{GObjectAccessible, NONE_GOBJECT_ACCESSIBLE};
 
 mod hyperlink;
 pub use self::hyperlink::HyperlinkExt;
-pub use self::hyperlink::{Hyperlink, HyperlinkClass, NONE_HYPERLINK};
+pub use self::hyperlink::{Hyperlink, NONE_HYPERLINK};
 
 mod hyperlink_impl;
 pub use self::hyperlink_impl::HyperlinkImplExt;
@@ -42,51 +40,49 @@ pub use self::image::{Image, NONE_IMAGE};
 
 mod misc;
 pub use self::misc::AtkMiscExt;
-pub use self::misc::{Misc, MiscClass, NONE_MISC};
+pub use self::misc::{Misc, NONE_MISC};
 
 mod no_op_object;
-pub use self::no_op_object::{NoOpObject, NoOpObjectClass, NONE_NO_OP_OBJECT};
+pub use self::no_op_object::{NoOpObject, NONE_NO_OP_OBJECT};
 
 mod no_op_object_factory;
-pub use self::no_op_object_factory::{
-    NoOpObjectFactory, NoOpObjectFactoryClass, NONE_NO_OP_OBJECT_FACTORY,
-};
+pub use self::no_op_object_factory::{NoOpObjectFactory, NONE_NO_OP_OBJECT_FACTORY};
 
 mod object;
 pub use self::object::AtkObjectExt;
-pub use self::object::{Object, ObjectClass, NONE_OBJECT};
+pub use self::object::{Object, NONE_OBJECT};
 
 mod object_factory;
 pub use self::object_factory::ObjectFactoryExt;
-pub use self::object_factory::{ObjectFactory, ObjectFactoryClass, NONE_OBJECT_FACTORY};
+pub use self::object_factory::{ObjectFactory, NONE_OBJECT_FACTORY};
 
 mod plug;
 pub use self::plug::AtkPlugExt;
-pub use self::plug::{Plug, PlugClass, NONE_PLUG};
+pub use self::plug::{Plug, NONE_PLUG};
 
 mod registry;
 pub use self::registry::RegistryExt;
-pub use self::registry::{Registry, RegistryClass, NONE_REGISTRY};
+pub use self::registry::{Registry, NONE_REGISTRY};
 
 mod relation;
 pub use self::relation::RelationExt;
-pub use self::relation::{Relation, RelationClass, NONE_RELATION};
+pub use self::relation::{Relation, NONE_RELATION};
 
 mod relation_set;
 pub use self::relation_set::RelationSetExt;
-pub use self::relation_set::{RelationSet, RelationSetClass, NONE_RELATION_SET};
+pub use self::relation_set::{RelationSet, NONE_RELATION_SET};
 
 mod selection;
 pub use self::selection::SelectionExt;
 pub use self::selection::{Selection, NONE_SELECTION};
 
 mod socket;
 pub use self::socket::AtkSocketExt;
-pub use self::socket::{Socket, SocketClass, NONE_SOCKET};
+pub use self::socket::{Socket, NONE_SOCKET};
 
 mod state_set;
 pub use self::state_set::StateSetExt;
-pub use self::state_set::{StateSet, StateSetClass, NONE_STATE_SET};
+pub use self::state_set::{StateSet, NONE_STATE_SET};
 
 mod streamable_content;
 pub use self::streamable_content::StreamableContentExt;
@@ -105,7 +101,7 @@ pub use self::text::TextExt;
 pub use self::text::{Text, NONE_TEXT};
 
 mod util;
-pub use self::util::{Util, UtilClass, NONE_UTIL};
+pub use self::util::{Util, NONE_UTIL};
 
 mod value;
 pub use self::value::ValueExt;

atk/src/auto/no_op_object.rs

@@ -23,7 +23,7 @@ use Value;
 use Window;
 
 glib_wrapper! {
-    pub struct NoOpObject(Object<atk_sys::AtkNoOpObject, atk_sys::AtkNoOpObjectClass, NoOpObjectClass>) @extends Object, @implements Action, Component, Document, EditableText, Hypertext, Image, Selection, Table, TableCell, Text, Value, Window;
+    pub struct NoOpObject(Object<atk_sys::AtkNoOpObject, atk_sys::AtkNoOpObjectClass>) @extends Object, @implements Action, Component, Document, EditableText, Hypertext, Image, Selection, Table, TableCell, Text, Value, Window;
 
     match fn {
         get_type => || atk_sys::atk_no_op_object_get_type(),

atk/src/auto/no_op_object_factory.rs

@@ -9,7 +9,7 @@ use std::fmt;
 use ObjectFactory;
 
 glib_wrapper! {
-    pub struct NoOpObjectFactory(Object<atk_sys::AtkNoOpObjectFactory, atk_sys::AtkNoOpObjectFactoryClass, NoOpObjectFactoryClass>) @extends ObjectFactory;
+    pub struct NoOpObjectFactory(Object<atk_sys::AtkNoOpObjectFactory, atk_sys::AtkNoOpObjectFactoryClass>) @extends ObjectFactory;
 
     match fn {
         get_type => || atk_sys::atk_no_op_object_factory_get_type(),

atk/src/auto/object.rs

@@ -26,7 +26,7 @@ use State;
 use StateSet;
 
 glib_wrapper! {
-    pub struct Object(Object<atk_sys::AtkObject, atk_sys::AtkObjectClass, ObjectClass>);
+    pub struct Object(Object<atk_sys::AtkObject, atk_sys::AtkObjectClass>);
 
     match fn {
         get_type => || atk_sys::atk_object_get_type(),

atk/src/auto/object_factory.rs

@@ -10,7 +10,7 @@ use std::fmt;
 use Object;
 
 glib_wrapper! {
-    pub struct ObjectFactory(Object<atk_sys::AtkObjectFactory, atk_sys::AtkObjectFactoryClass, ObjectFactoryClass>);
+    pub struct ObjectFactory(Object<atk_sys::AtkObjectFactory, atk_sys::AtkObjectFactoryClass>);
 
     match fn {
         get_type => || atk_sys::atk_object_factory_get_type(),

atk/src/auto/plug.rs

@@ -12,7 +12,7 @@ use Component;
 use Object;
 
 glib_wrapper! {
-    pub struct Plug(Object<atk_sys::AtkPlug, atk_sys::AtkPlugClass, PlugClass>) @extends Object, @implements Component;
+    pub struct Plug(Object<atk_sys::AtkPlug, atk_sys::AtkPlugClass>) @extends Object, @implements Component;
 
     match fn {
         get_type => || atk_sys::atk_plug_get_type(),

atk/src/auto/registry.rs

@@ -10,7 +10,7 @@ use std::fmt;
 use ObjectFactory;
 
 glib_wrapper! {
-    pub struct Registry(Object<atk_sys::AtkRegistry, atk_sys::AtkRegistryClass, RegistryClass>);
+    pub struct Registry(Object<atk_sys::AtkRegistry, atk_sys::AtkRegistryClass>);
 
     match fn {
         get_type => || atk_sys::atk_registry_get_type(),

atk/src/auto/relation.rs

@@ -19,7 +19,7 @@ use Object;
 use RelationType;
 
 glib_wrapper! {
-    pub struct Relation(Object<atk_sys::AtkRelation, atk_sys::AtkRelationClass, RelationClass>);
+    pub struct Relation(Object<atk_sys::AtkRelation, atk_sys::AtkRelationClass>);
 
     match fn {
         get_type => || atk_sys::atk_relation_get_type(),

atk/src/auto/relation_set.rs

@@ -11,7 +11,7 @@ use Relation;
 use RelationType;
 
 glib_wrapper! {
-    pub struct RelationSet(Object<atk_sys::AtkRelationSet, atk_sys::AtkRelationSetClass, RelationSetClass>);
+    pub struct RelationSet(Object<atk_sys::AtkRelationSet, atk_sys::AtkRelationSetClass>);
 
     match fn {
         get_type => || atk_sys::atk_relation_set_get_type(),

atk/src/auto/socket.rs

@@ -11,7 +11,7 @@ use Component;
 use Object;
 
 glib_wrapper! {
-    pub struct Socket(Object<atk_sys::AtkSocket, atk_sys::AtkSocketClass, SocketClass>) @extends Object, @implements Component;
+    pub struct Socket(Object<atk_sys::AtkSocket, atk_sys::AtkSocketClass>) @extends Object, @implements Component;
 
     match fn {
         get_type => || atk_sys::atk_socket_get_type(),

atk/src/auto/state_set.rs

@@ -9,7 +9,7 @@ use std::fmt;
 use StateType;
 
 glib_wrapper! {
-    pub struct StateSet(Object<atk_sys::AtkStateSet, atk_sys::AtkStateSetClass, StateSetClass>);
+    pub struct StateSet(Object<atk_sys::AtkStateSet, atk_sys::AtkStateSetClass>);
 
     match fn {
         get_type => || atk_sys::atk_state_set_get_type(),

atk/src/auto/util.rs

@@ -7,7 +7,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct Util(Object<atk_sys::AtkUtil, atk_sys::AtkUtilClass, UtilClass>);
+    pub struct Util(Object<atk_sys::AtkUtil, atk_sys::AtkUtilClass>);
 
     match fn {
         get_type => || atk_sys::atk_util_get_type(),

atk/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

atk/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

examples/src/bin/basic_subclass.rs

@@ -194,7 +194,7 @@ mod imp_app {
 }
 
 glib_wrapper! {
-    pub struct SimpleApplication(ObjectSubclass<imp_app::SimpleApplication, SimpleApplicationClass>)
+    pub struct SimpleApplication(ObjectSubclass<imp_app::SimpleApplication>)
         @extends gio::Application, gtk::Application;
 }
 

gdk-pixbuf/src/auto/mod.rs

@@ -3,18 +3,18 @@
 // DO NOT EDIT
 
 mod pixbuf;
-pub use self::pixbuf::{Pixbuf, PixbufClass};
+pub use self::pixbuf::Pixbuf;
 
 mod pixbuf_animation;
 pub use self::pixbuf_animation::PixbufAnimationExt;
-pub use self::pixbuf_animation::{PixbufAnimation, PixbufAnimationClass, NONE_PIXBUF_ANIMATION};
+pub use self::pixbuf_animation::{PixbufAnimation, NONE_PIXBUF_ANIMATION};
 
 mod pixbuf_loader;
 pub use self::pixbuf_loader::PixbufLoaderExt;
-pub use self::pixbuf_loader::{PixbufLoader, PixbufLoaderClass, NONE_PIXBUF_LOADER};
+pub use self::pixbuf_loader::{PixbufLoader, NONE_PIXBUF_LOADER};
 
 mod pixbuf_simple_anim;
-pub use self::pixbuf_simple_anim::{PixbufSimpleAnim, PixbufSimpleAnimClass};
+pub use self::pixbuf_simple_anim::PixbufSimpleAnim;
 
 mod pixbuf_format;
 pub use self::pixbuf_format::PixbufFormat;

gdk-pixbuf/src/auto/pixbuf.rs

@@ -20,7 +20,7 @@ use PixbufFormat;
 use PixbufRotation;
 
 glib_wrapper! {
-    pub struct Pixbuf(Object<gdk_pixbuf_sys::GdkPixbuf, PixbufClass>) @implements gio::Icon, gio::LoadableIcon;
+    pub struct Pixbuf(Object<gdk_pixbuf_sys::GdkPixbuf>) @implements gio::Icon, gio::LoadableIcon;
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_get_type(),

gdk-pixbuf/src/auto/pixbuf_animation.rs

@@ -18,7 +18,7 @@ use std::ptr;
 use Pixbuf;
 
 glib_wrapper! {
-    pub struct PixbufAnimation(Object<gdk_pixbuf_sys::GdkPixbufAnimation, PixbufAnimationClass>);
+    pub struct PixbufAnimation(Object<gdk_pixbuf_sys::GdkPixbufAnimation>);
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_animation_get_type(),

gdk-pixbuf/src/auto/pixbuf_loader.rs

@@ -20,7 +20,7 @@ use PixbufAnimation;
 use PixbufFormat;
 
 glib_wrapper! {
-    pub struct PixbufLoader(Object<gdk_pixbuf_sys::GdkPixbufLoader, gdk_pixbuf_sys::GdkPixbufLoaderClass, PixbufLoaderClass>);
+    pub struct PixbufLoader(Object<gdk_pixbuf_sys::GdkPixbufLoader, gdk_pixbuf_sys::GdkPixbufLoaderClass>);
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_loader_get_type(),

gdk-pixbuf/src/auto/pixbuf_simple_anim.rs

@@ -15,7 +15,7 @@ use Pixbuf;
 use PixbufAnimation;
 
 glib_wrapper! {
-    pub struct PixbufSimpleAnim(Object<gdk_pixbuf_sys::GdkPixbufSimpleAnim, gdk_pixbuf_sys::GdkPixbufSimpleAnimClass, PixbufSimpleAnimClass>) @extends PixbufAnimation;
+    pub struct PixbufSimpleAnim(Object<gdk_pixbuf_sys::GdkPixbufSimpleAnim, gdk_pixbuf_sys::GdkPixbufSimpleAnimClass>) @extends PixbufAnimation;
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_simple_anim_get_type(),

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

gdk-pixbuf/src/pixbuf_animation_iter.rs

@@ -9,7 +9,7 @@ use glib::translate::*;
 use std::time::SystemTime;
 
 glib_wrapper! {
-    pub struct PixbufAnimationIter(Object<gdk_pixbuf_sys::GdkPixbufAnimationIter, PixbufAnimationIterClass>);
+    pub struct PixbufAnimationIter(Object<gdk_pixbuf_sys::GdkPixbufAnimationIter>);
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_animation_iter_get_type(),

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

gdk/src/auto/app_launch_context.rs

@@ -15,7 +15,7 @@ use Display;
 use Screen;
 
 glib_wrapper! {
-    pub struct AppLaunchContext(Object<gdk_sys::GdkAppLaunchContext, AppLaunchContextClass>) @extends gio::AppLaunchContext;
+    pub struct AppLaunchContext(Object<gdk_sys::GdkAppLaunchContext>) @extends gio::AppLaunchContext;
 
     match fn {
         get_type => || gdk_sys::gdk_app_launch_context_get_type(),

gdk/src/auto/cursor.rs

@@ -12,7 +12,7 @@ use CursorType;
 use Display;
 
 glib_wrapper! {
-    pub struct Cursor(Object<gdk_sys::GdkCursor, CursorClass>);
+    pub struct Cursor(Object<gdk_sys::GdkCursor>);
 
     match fn {
         get_type => || gdk_sys::gdk_cursor_get_type(),

gdk/src/auto/device.rs

@@ -40,7 +40,7 @@ use Seat;
 use Window;
 
 glib_wrapper! {
-    pub struct Device(Object<gdk_sys::GdkDevice, DeviceClass>);
+    pub struct Device(Object<gdk_sys::GdkDevice>);
 
     match fn {
         get_type => || gdk_sys::gdk_device_get_type(),

gdk/src/auto/device_manager.rs

@@ -16,7 +16,7 @@ use DeviceType;
 use Display;
 
 glib_wrapper! {
-    pub struct DeviceManager(Object<gdk_sys::GdkDeviceManager, DeviceManagerClass>);
+    pub struct DeviceManager(Object<gdk_sys::GdkDeviceManager>);
 
     match fn {
         get_type => || gdk_sys::gdk_device_manager_get_type(),

gdk/src/auto/device_tool.rs

@@ -13,7 +13,7 @@ use AxisFlags;
 use DeviceToolType;
 
 glib_wrapper! {
-    pub struct DeviceTool(Object<gdk_sys::GdkDeviceTool, DeviceToolClass>);
+    pub struct DeviceTool(Object<gdk_sys::GdkDeviceTool>);
 
     match fn {
         get_type => || gdk_sys::gdk_device_tool_get_type(),

gdk/src/auto/display.rs

@@ -27,7 +27,7 @@ use Seat;
 use Window;
 
 glib_wrapper! {
-    pub struct Display(Object<gdk_sys::GdkDisplay, DisplayClass>);
+    pub struct Display(Object<gdk_sys::GdkDisplay>);
 
     match fn {
         get_type => || gdk_sys::gdk_display_get_type(),

gdk/src/auto/display_manager.rs

@@ -14,7 +14,7 @@ use std::mem::transmute;
 use Display;
 
 glib_wrapper! {
-    pub struct DisplayManager(Object<gdk_sys::GdkDisplayManager, DisplayManagerClass>);
+    pub struct DisplayManager(Object<gdk_sys::GdkDisplayManager>);
 
     match fn {
         get_type => || gdk_sys::gdk_display_manager_get_type(),

gdk/src/auto/drag_context.rs

@@ -30,7 +30,7 @@ use DragProtocol;
 use Window;
 
 glib_wrapper! {
-    pub struct DragContext(Object<gdk_sys::GdkDragContext, DragContextClass>);
+    pub struct DragContext(Object<gdk_sys::GdkDragContext>);
 
     match fn {
         get_type => || gdk_sys::gdk_drag_context_get_type(),

gdk/src/auto/drawing_context.rs

@@ -11,7 +11,7 @@ use std::fmt;
 use Window;
 
 glib_wrapper! {
-    pub struct DrawingContext(Object<gdk_sys::GdkDrawingContext, gdk_sys::GdkDrawingContextClass, DrawingContextClass>);
+    pub struct DrawingContext(Object<gdk_sys::GdkDrawingContext, gdk_sys::GdkDrawingContextClass>);
 
     match fn {
         get_type => || gdk_sys::gdk_drawing_context_get_type(),

gdk/src/auto/frame_clock.rs

@@ -15,7 +15,7 @@ use FrameClockPhase;
 use FrameTimings;
 
 glib_wrapper! {
-    pub struct FrameClock(Object<gdk_sys::GdkFrameClock, gdk_sys::GdkFrameClockClass, FrameClockClass>);
+    pub struct FrameClock(Object<gdk_sys::GdkFrameClock, gdk_sys::GdkFrameClockClass>);
 
     match fn {
         get_type => || gdk_sys::gdk_frame_clock_get_type(),