This repository was archived by the owner on Mar 4, 2024. It is now read-only.
In glib_object_wrapper!, use generic Class type instead defining a struct #10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ids1024
force-pushed
the
generic-class
branch
from
83b4469 to
09ead62
Compare
|
Can you rebase on top of latest master? Then we get CI back :) |
sdroege
reviewed
Nov 4, 2020
sdroege
reviewed
Nov 4, 2020
sdroege
reviewed
Nov 4, 2020
sdroege
reviewed
Nov 4, 2020
ids1024
force-pushed
the
generic-class
branch
from
09ead62 to
38a946d
Compare
…ruct This makes the `$rust_class_name` argument in `glib_wrapper!` optional. If specified, it defines a `type` alias for the class. At least optionally allowing it is required to avoid breaking lots of gir generated code, but perhaps it can be removed after a change to gir. This removes the `ObjectType::RustClassType` associated type, since it can't be enforced/assumed by the type system that that is an instance of this generic struct. The `IsClassFor` trait is also removed, superseded by this generic type. This also changes the `IsSubclassable` trait to be implemented on the object struct rather than the class struct, since there otherwise would be foreign trait on foreign type errors.
ids1024
force-pushed
the
generic-class
branch
from
38a946d to
08731f2
Compare
|
I'll merge this later today or tomorrow once I've updated |
GuillaumeGomez
approved these changes
Nov 5, 2020
|
Thanks! |
sdroege
reviewed
Nov 5, 2020
|
|
||
| match fn { | ||
| get_type => || $get_type_expr:expr, | ||
| } | ||
| ) => { | ||
| $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void, $rust_class_name, @get_type $get_type_expr, @extends [], @implements []); | ||
| $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void, @get_type $get_type_expr, @extends [], @implements []); |
There was a problem hiding this comment.
@ids1024 Can you also do the gir change that makes it use the new variants without the explicit class name?
There was a problem hiding this comment.
It doesn't look complicated to update gir, but I'm seeing issues running generator.py with gir master similar to those mentioned in #11
There was a problem hiding this comment.
Indeed, something's broken currently. Can you create an issue for gir otherwise?
sdroege
reviewed
Nov 5, 2020
That's waiting here now https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/621 |
sdroege
force-pushed
the
generic-class
branch
from
08731f2 to
e260e69
Compare
This makes it easier/safer to implement `IsSubclassable`.
sdroege
force-pushed
the
generic-class
branch
from
e260e69 to
ab67eb8
Compare
gstreamer-github
pushed a commit
to sdroege/gstreamer-rs
that referenced
this pull request
Nov 5, 2020
ids1024
added a commit
to ids1024/gir
that referenced
this pull request
Nov 5, 2020
This is possible due to gtk-rs/gtk3-rs#10
ids1024
added a commit
to ids1024/gir
that referenced
this pull request
Nov 5, 2020
This is possible due to gtk-rs/gtk3-rs#10
sdroege
pushed a commit
to ids1024/gir
that referenced
this pull request
Nov 6, 2020
This is possible due to gtk-rs/gtk3-rs#10
elmarco
pushed a commit
to elmarco/gtk-rs
that referenced
this pull request
Feb 10, 2021
Regenerate with latest gir
elmarco
pushed a commit
to elmarco/gtk-rs
that referenced
this pull request
Feb 10, 2021
groovy update: regenerate
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update of gtk-rs/glib#720 with corresponding changes to other crates.
This makes the
$rust_class_nameargument inglib_wrapper!optional. If specified, it defines atypealias for the class. At least optionally allowing it is required to avoid breaking lots of gir generated code, but perhaps it can be removed after a change to gir.This removes the
ObjectType::RustClassTypeassociated type, since it can't be enforced/assumed by the type system that that is an instance of this generic struct.The
IsClassFortrait is also removed, superseded by this generic type.This also changes the
IsSubclassabletrait to be implemented on the object struct rather than the class struct, since there otherwise would be foreign trait on foreign type errors.