Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Into #734

Merged
merged 2 commits into from Oct 28, 2018

Conversation

Projects
None yet
3 participants
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Oct 27, 2018

Fixes #733.

cc @sdroege @EPashkin

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:into branch from b1f4a90 to 0b8047a Oct 27, 2018

flags: DialogFlags, buttons: &[(&str, ResponseType)]) -> Dialog {
pub fn new_with_buttons<'a, I: Into<Option<&'a str>>, T: IsA<Window>>(
title: I,
parent: Option<&T>,

This comment has been minimized.

@EPashkin

EPashkin Oct 28, 2018

Member

This don't changed on purpose?

This comment has been minimized.

@GuillaumeGomez

GuillaumeGomez Oct 28, 2018

Author Member

We didn't implement Into on IsA yet so not for now.

This comment has been minimized.

@sdroege

sdroege Oct 28, 2018

Member

That is also not so easy because IsA is a bit convoluted (same reason why it can't be used as trait objects). I have a plan but no time ;)

This comment has been minimized.

@GuillaumeGomez

GuillaumeGomez Oct 28, 2018

Author Member

Luckily for us, hackfest is *soon*! (@EPashkin still invited you are btw ;) )

@EPashkin

This comment has been minimized.

Copy link
Member

EPashkin commented Oct 28, 2018

Needed fix for check:

diff --git a/check_init_asserts b/check_init_asserts
index 09f3b5b1..eefece95 100755
--- a/check_init_asserts
+++ b/check_init_asserts
@@ -5,7 +5,7 @@ BEGIN { $e = 0 }
 while (/^(\N*)\V*fn\s+(\w+)\s*(<[^(]+>)?\s*(\([^{;]+)\{\N*\n^(\N*)$/gms) {
 	($modifiers, $name, $signature, $first_line) = ($1, $2, $4, $5);
 	unless ($modifiers =~ /^\s*(\/\/|(pub )?unsafe)/ ||
 	unless ($modifiers =~ /^\s*(\/\/|(pub )?unsafe)/ ||
-		$signature =~ /^\((&(\x27\w+ )?)?(mut )?self\b/ ||
+		$signature =~ /^\(\s*(&(\x27\w+ )?)?(mut )?self\b/ ||
 		$signature =~ /^\(\)/ ||
 		$first_line =~ /^\s*(
 			assert_initialized_main_thread |
@@ -5,7 +5,7 @@ BEGIN { $e = 0 }
while (/^(\N*)\V*fn\s+(\w+)\s*(<[^(]+>)?\s*(\([^{;]+)\{\N*\n^(\N*)$/gms) {
($modifiers, $name, $signature, $first_line) = ($1, $2, $4, $5);
unless ($modifiers =~ /^\s*(\/\/|(pub )?unsafe)/ ||
$signature =~ /^\((&(\x27\w+ )?)?(mut )?self\b/ ||
$signature =~ /^\(\s*(&(\x27\w+ )?)?(mut )?self\b/ ||

This comment has been minimized.

@EPashkin

EPashkin Oct 28, 2018

Member

Please, fix padding here.

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:into branch from a9926f0 to ec5fe4b Oct 28, 2018

@GuillaumeGomez GuillaumeGomez referenced this pull request Oct 28, 2018

Merged

Fix for into PR #45

@EPashkin

This comment has been minimized.

Copy link
Member

EPashkin commented Oct 28, 2018

@GuillaumeGomez Thanks and 👍 if CI passed.
IMHO better restart one of gtk3.22 to be sure.

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Oct 28, 2018

I need to update our lgpl-docs repository first then I'll restart travis.

@GuillaumeGomez GuillaumeGomez merged commit aa01378 into gtk-rs:master Oct 28, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@GuillaumeGomez GuillaumeGomez deleted the GuillaumeGomez:into branch Oct 28, 2018

vhdirk pushed a commit to vhdirk/gtk-rs that referenced this pull request Jan 16, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.