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

Commit 52000cd

Browse files
sdroegesdroege
authored
Merge pull request #688 from lucab/ups/gir-err-safety
Regenerate with latest gir (assert safe gerror)
2 parents 67b273a + 9570f0c commit 52000cd

20 files changed

+75
-42
lines changed

‎atk/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 50377b886959)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 878c7cdd654c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)

‎atk/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 50377b886959)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 878c7cdd654c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)

‎gdk/src/auto/gl_context.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ impl GLContext {
117117
pub fn realize(&self) -> Result<(), glib::Error> {
118118
unsafe {
119119
let mut error = ptr::null_mut();
120-
let _ = ffi::gdk_gl_context_realize(self.to_glib_none().0, &mut error);
120+
let is_ok = ffi::gdk_gl_context_realize(self.to_glib_none().0, &mut error);
121+
assert_eq!(is_ok == 0, !error.is_null());
121122
if error.is_null() {
122123
Ok(())
123124
} else {

‎gdk/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 50377b886959)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 878c7cdd654c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)

‎gdk/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 50377b886959)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 878c7cdd654c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)

‎gdkx11/src/auto/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 50377b886959)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 878c7cdd654c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)

‎gdkx11/sys/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 50377b886959)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 878c7cdd654c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)

‎gir

‎gtk/src/auto/builder.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,12 @@ impl<O: IsA<Builder>> BuilderExt for O {
156156
fn add_from_resource(&self, resource_path: &str) -> Result<(), glib::Error> {
157157
unsafe {
158158
let mut error = ptr::null_mut();
159-
let _ = ffi::gtk_builder_add_from_resource(
159+
let is_ok = ffi::gtk_builder_add_from_resource(
160160
self.as_ref().to_glib_none().0,
161161
resource_path.to_glib_none().0,
162162
&mut error,
163163
);
164+
assert_eq!(is_ok == 0, !error.is_null());
164165
if error.is_null() {
165166
Ok(())
166167
} else {
@@ -173,12 +174,13 @@ impl<O: IsA<Builder>> BuilderExt for O {
173174
let length = buffer.len() as usize;
174175
unsafe {
175176
let mut error = ptr::null_mut();
176-
let _ = ffi::gtk_builder_add_from_string(
177+
let is_ok = ffi::gtk_builder_add_from_string(
177178
self.as_ref().to_glib_none().0,
178179
buffer.to_glib_none().0,
179180
length,
180181
&mut error,
181182
);
183+
assert_eq!(is_ok == 0, !error.is_null());
182184
if error.is_null() {
183185
Ok(())
184186
} else {
@@ -194,12 +196,13 @@ impl<O: IsA<Builder>> BuilderExt for O {
194196
) -> Result<(), glib::Error> {
195197
unsafe {
196198
let mut error = ptr::null_mut();
197-
let _ = ffi::gtk_builder_add_objects_from_resource(
199+
let is_ok = ffi::gtk_builder_add_objects_from_resource(
198200
self.as_ref().to_glib_none().0,
199201
resource_path.to_glib_none().0,
200202
object_ids.to_glib_none().0,
201203
&mut error,
202204
);
205+
assert_eq!(is_ok == 0, !error.is_null());
203206
if error.is_null() {
204207
Ok(())
205208
} else {
@@ -216,13 +219,14 @@ impl<O: IsA<Builder>> BuilderExt for O {
216219
let length = buffer.len() as usize;
217220
unsafe {
218221
let mut error = ptr::null_mut();
219-
let _ = ffi::gtk_builder_add_objects_from_string(
222+
let is_ok = ffi::gtk_builder_add_objects_from_string(
220223
self.as_ref().to_glib_none().0,
221224
buffer.to_glib_none().0,
222225
length,
223226
object_ids.to_glib_none().0,
224227
&mut error,
225228
);
229+
assert_eq!(is_ok == 0, !error.is_null());
226230
if error.is_null() {
227231
Ok(())
228232
} else {
@@ -254,14 +258,15 @@ impl<O: IsA<Builder>> BuilderExt for O {
254258
let length = buffer.len() as usize;
255259
unsafe {
256260
let mut error = ptr::null_mut();
257-
let _ = ffi::gtk_builder_extend_with_template(
261+
let is_ok = ffi::gtk_builder_extend_with_template(
258262
self.as_ref().to_glib_none().0,
259263
widget.as_ref().to_glib_none().0,
260264
template_type.into_glib(),
261265
buffer.to_glib_none().0,
262266
length,
263267
&mut error,
264268
);
269+
assert_eq!(is_ok == 0, !error.is_null());
265270
if error.is_null() {
266271
Ok(())
267272
} else {
@@ -333,13 +338,14 @@ impl<O: IsA<Builder>> BuilderExt for O {
333338
unsafe {
334339
let mut value = glib::Value::uninitialized();
335340
let mut error = ptr::null_mut();
336-
let _ = ffi::gtk_builder_value_from_string(
341+
let is_ok = ffi::gtk_builder_value_from_string(
337342
self.as_ref().to_glib_none().0,
338343
pspec.to_glib_none().0,
339344
string.to_glib_none().0,
340345
value.to_glib_none_mut().0,
341346
&mut error,
342347
);
348+
assert_eq!(is_ok == 0, !error.is_null());
343349
if error.is_null() {
344350
Ok(value)
345351
} else {
@@ -356,13 +362,14 @@ impl<O: IsA<Builder>> BuilderExt for O {
356362
unsafe {
357363
let mut value = glib::Value::uninitialized();
358364
let mut error = ptr::null_mut();
359-
let _ = ffi::gtk_builder_value_from_string_type(
365+
let is_ok = ffi::gtk_builder_value_from_string_type(
360366
self.as_ref().to_glib_none().0,
361367
type_.into_glib(),
362368
string.to_glib_none().0,
363369
value.to_glib_none_mut().0,
364370
&mut error,
365371
);
372+
assert_eq!(is_ok == 0, !error.is_null());
366373
if error.is_null() {
367374
Ok(value)
368375
} else {

‎gtk/src/auto/css_provider.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,13 @@ impl<O: IsA<CssProvider>> CssProviderExt for O {
9595
let length = data.len() as isize;
9696
unsafe {
9797
let mut error = ptr::null_mut();
98-
let _ = ffi::gtk_css_provider_load_from_data(
98+
let is_ok = ffi::gtk_css_provider_load_from_data(
9999
self.as_ref().to_glib_none().0,
100100
data.to_glib_none().0,
101101
length,
102102
&mut error,
103103
);
104+
assert_eq!(is_ok == 0, !error.is_null());
104105
if error.is_null() {
105106
Ok(())
106107
} else {
@@ -112,11 +113,12 @@ impl<O: IsA<CssProvider>> CssProviderExt for O {
112113
fn load_from_file(&self, file: &impl IsA<gio::File>) -> Result<(), glib::Error> {
113114
unsafe {
114115
let mut error = ptr::null_mut();
115-
let _ = ffi::gtk_css_provider_load_from_file(
116+
let is_ok = ffi::gtk_css_provider_load_from_file(
116117
self.as_ref().to_glib_none().0,
117118
file.as_ref().to_glib_none().0,
118119
&mut error,
119120
);
121+
assert_eq!(is_ok == 0, !error.is_null());
120122
if error.is_null() {
121123
Ok(())
122124
} else {
@@ -128,11 +130,12 @@ impl<O: IsA<CssProvider>> CssProviderExt for O {
128130
fn load_from_path(&self, path: &str) -> Result<(), glib::Error> {
129131
unsafe {
130132
let mut error = ptr::null_mut();
131-
let _ = ffi::gtk_css_provider_load_from_path(
133+
let is_ok = ffi::gtk_css_provider_load_from_path(
132134
self.as_ref().to_glib_none().0,
133135
path.to_glib_none().0,
134136
&mut error,
135137
);
138+
assert_eq!(is_ok == 0, !error.is_null());
136139
if error.is_null() {
137140
Ok(())
138141
} else {

0 commit comments

Comments
 (0)