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

Commit 70d65b7

Browse files
sdroegesdroege
authored
Merge pull request #11 from fengalin/translate-option-result
glib/translate: take advantage of Rust Option & Result types
2 parents 77a9fc7 + 3ed67e0 commit 70d65b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+762
-392
lines changed

‎atk/Gir.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ manual_traits = ["EditableTextExtManual"]
7777
[[object.function]]
7878
name = "insert_text"
7979
# Expected pointer, received integer
80-
ignore = true
80+
manual = true
8181

8282
[[object]]
8383
name = "Atk.Image"
@@ -110,10 +110,10 @@ status = "generate"
110110
manual_traits = ["TableExtManual"]
111111
[[object.function]]
112112
name = "get_selected_columns"
113-
ignore = true
113+
manual = true
114114
[[object.function]]
115115
name = "get_selected_rows"
116-
ignore = true
116+
manual = true
117117

118118
[[object]]
119119
name = "Atk.Text"

‎atk/src/auto/text.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,11 @@ impl<O: IsA<Text>> TextExt for O {
145145

146146
fn get_character_at_offset(&self, offset: i32) -> char {
147147
unsafe {
148-
from_glib(atk_sys::atk_text_get_character_at_offset(
148+
std::convert::TryFrom::try_from(atk_sys::atk_text_get_character_at_offset(
149149
self.as_ref().to_glib_none().0,
150150
offset,
151151
))
152+
.expect("conversion from an invalid Unicode value attempted")
152153
}
153154
}
154155

‎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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎atk/sys/Cargo.toml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-dependencies]
2-
system-deps = "1.3"
2+
system-deps = "2.0"
33

44
[dependencies]
55
libc = "0.2"
@@ -40,7 +40,11 @@ features = ["dox"]
4040
name = "atk"
4141
version = "2.14"
4242

43-
[package.metadata.system-deps.atk.feature-versions]
44-
v2_30 = "2.30"
45-
v2_32 = "2.32"
46-
v2_34 = "2.34"
43+
[package.metadata.system-deps.atk.v2_30]
44+
version = "2.30"
45+
46+
[package.metadata.system-deps.atk.v2_32]
47+
version = "2.32"
48+
49+
[package.metadata.system-deps.atk.v2_34]
50+
version = "2.34"

‎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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎gdk-pixbuf/Gir.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ status = "generate"
3636
[[object.function]]
3737
name = "get_pixels"
3838
#manual array without length
39-
ignore = true
39+
manual = true
4040
[[object.function]]
4141
name = "get_pixels_with_length"
4242
#manual as get_pixels
@@ -48,59 +48,59 @@ status = "generate"
4848
[[object.function]]
4949
name = "new_from_file"
5050
#manual is_windows_utf8
51-
ignore = true
51+
manual = true
5252
[[object.function]]
5353
name = "new"
5454
[object.function.return]
5555
nullable = true
5656
[[object.function]]
5757
name = "new_from_file_at_size"
5858
#manual is_windows_utf8
59-
ignore = true
59+
manual = true
6060
[[object.function]]
6161
name = "new_from_file_at_scale"
6262
#manual is_windows_utf8
63-
ignore = true
63+
manual = true
6464
[[object.function]]
6565
name = "new_from_stream_async"
6666
# wrong async return
67-
ignore = true
67+
manual = true
6868
[[object.function]]
6969
name = "new_from_stream_at_scale_async"
7070
# wrong return and don't generated
71-
ignore = true
71+
manual = true
7272
[[object.function]]
7373
name = "get_file_info"
7474
# wrong return
75-
ignore = true
75+
manual = true
7676
[[object.function]]
7777
name = "get_file_info_async"
7878
# wrong async return
79-
ignore = true
79+
manual = true
8080
[[object.function]]
8181
name = "save_to_bufferv"
8282
# manual complex param
83-
ignore = true
83+
manual = true
8484
[[object.function]]
8585
name = "save_to_streamv"
8686
# manual complex param
87-
ignore = true
87+
manual = true
8888
[[object.function]]
8989
name = "savev"
9090
# manual complex param
91-
ignore = true
91+
manual = true
9292
[[object.function]]
9393
name = "save_to_streamv_async"
9494
# manual complex param
95-
ignore = true
95+
manual = true
9696

9797
[[object]]
9898
name = "GdkPixbuf.PixbufAnimation"
9999
status = "generate"
100100
[[object.function]]
101101
name = "get_iter"
102102
# TimeVal misses memory management functions
103-
ignore = true
103+
manual = true
104104

105105
[[object]]
106106
name = "GdkPixbuf.PixbufFormat"

‎gdk-pixbuf/src/auto/pixbuf.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -573,14 +573,6 @@ impl Pixbuf {
573573
}
574574
}
575575

576-
//pub fn get_property_pixels(&self) -> /*Unimplemented*/Fundamental: Pointer {
577-
// unsafe {
578-
// let mut value = Value::from_type(</*Unknown type*/ as StaticType>::static_type());
579-
// gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"pixels\0".as_ptr() as *const _, value.to_glib_none_mut().0);
580-
// value.get().expect("Return Value for property `pixels` getter").unwrap()
581-
// }
582-
//}
583-
584576
#[cfg(any(feature = "v2_36_8", feature = "dox"))]
585577
pub fn calculate_rowstride(
586578
colorspace: Colorspace,

‎gdk-pixbuf/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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎gdk-pixbuf/sys/Cargo.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-dependencies]
2-
system-deps = "1.3"
2+
system-deps = "2.0"
33

44
[dependencies]
55
libc = "0.2"
@@ -44,8 +44,14 @@ features = ["dox"]
4444
name = "gdk-pixbuf-2.0"
4545
version = "2.30"
4646

47-
[package.metadata.system-deps.gdk_pixbuf_2_0.feature-versions]
48-
v2_32 = "2.32"
49-
v2_36 = "2.36"
50-
v2_36_8 = "2.36.8"
51-
v2_40 = "2.40"
47+
[package.metadata.system-deps.gdk_pixbuf_2_0.v2_32]
48+
version = "2.32"
49+
50+
[package.metadata.system-deps.gdk_pixbuf_2_0.v2_36]
51+
version = "2.36"
52+
53+
[package.metadata.system-deps.gdk_pixbuf_2_0.v2_36_8]
54+
version = "2.36.8"
55+
56+
[package.metadata.system-deps.gdk_pixbuf_2_0.v2_40]
57+
version = "2.40"

‎gdk-pixbuf/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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎gdk/Gir.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ status = "generate"
220220
ignore = true # cannot be used as is
221221
[[object.function]]
222222
name = "get_history"
223-
ignore = true # need to call "free_history" function by hand
223+
manual = true # need to call "free_history" function by hand
224224
[[object.property]]
225225
name = "tool"
226226
version = "3.22"
@@ -302,7 +302,7 @@ status = "generate"
302302
[[object.function]]
303303
name = "get_refresh_info"
304304
#wrong gir: no out parameters
305-
ignore = true
305+
manual = true
306306

307307
[[object]]
308308
name = "Gdk.FrameTimings"
@@ -311,35 +311,35 @@ version = "3.8"
311311
[[object.function]]
312312
name = "get_predicted_presentation_time"
313313
# Use an `Option` for the return value
314-
ignore = true
314+
manual = true
315315
[[object.function]]
316316
name = "get_presentation_time"
317317
# Use an `Option` for the return value
318-
ignore = true
318+
manual = true
319319
[[object.function]]
320320
name = "get_refresh_interval"
321321
# Use an `Option` for the return value
322-
ignore = true
322+
manual = true
323323

324324
[[object]]
325325
name = "Gdk.Keymap"
326326
status = "generate"
327327
[[object.function]]
328328
name = "get_entries_for_keycode"
329329
# Invalid generation of Vec<KeymapKey>
330-
ignore = true
330+
manual = true
331331
[[object.function]]
332332
name = "get_entries_for_keyval"
333333
# Invalid generation of Vec<KeymapKey>
334-
ignore = true
334+
manual = true
335335
[[object.function]]
336336
name = "add_virtual_modifiers"
337337
# Invalid usage of "&mut ModifierType"
338-
ignore = true
338+
manual = true
339339
[[object.function]]
340340
name = "map_virtual_modifiers"
341341
# Invalid usage of "&mut ModifierType"
342-
ignore = true
342+
manual = true
343343

344344
[[object]]
345345
name = "Gdk.Monitor"
@@ -368,11 +368,11 @@ status = "generate"
368368
nullable = false
369369
[[object.function]]
370370
name = "get_font_options"
371-
ignore = true
371+
manual = true
372372
[[object.function]]
373373
name = "get_setting"
374374
# bool return value signals success
375-
ignore = true
375+
manual = true
376376

377377
[[object]]
378378
name = "Gdk.Seat"
@@ -401,14 +401,14 @@ status = "generate"
401401
manual_traits = ["WindowExtManual"]
402402
[[object.function]]
403403
name = "new"
404-
ignore = true
404+
manual = true
405405
[[object.function]]
406406
pattern = "[gs]et_background_pattern"
407-
ignore = true
407+
manual = true
408408
doc_trait_name = "WindowExtManual"
409409
[[object.function]]
410410
pattern = "[gs]et_user_data"
411-
ignore = true
411+
manual = true
412412
doc_trait_name = "WindowExtManual"
413413
[[object.function]]
414414
name = "get_effective_toplevel"
@@ -440,7 +440,7 @@ manual_traits = ["WindowExtManual"]
440440
version = "3.18"
441441
[[object.function]]
442442
name = "create_similar_surface"
443-
ignore = true
443+
manual = true
444444
[[object.function]]
445445
name = "set_opaque_region"
446446
[[object.function.parameter]]

‎gdk/src/auto/screen.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,6 @@ impl Screen {
199199
}
200200
}
201201

202-
//pub fn get_property_font_options(&self) -> /*Unimplemented*/Fundamental: Pointer {
203-
// unsafe {
204-
// let mut value = Value::from_type(</*Unknown type*/ as StaticType>::static_type());
205-
// gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"font-options\0".as_ptr() as *const _, value.to_glib_none_mut().0);
206-
// value.get().expect("Return Value for property `font-options` getter").unwrap()
207-
// }
208-
//}
209-
210202
pub fn get_default() -> Option<Screen> {
211203
assert_initialized_main_thread!();
212204
unsafe { from_glib_none(gdk_sys::gdk_screen_get_default()) }

‎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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎gdk/sys/Cargo.toml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-dependencies]
22
pkg-config = "0.3.7"
3-
system-deps = "1.3"
3+
system-deps = "2.0"
44

55
[dependencies]
66
libc = "0.2"
@@ -55,9 +55,17 @@ features = ["dox"]
5555
name = "gdk-3.0"
5656
version = "3.14"
5757

58-
[package.metadata.system-deps.gdk_3_0.feature-versions]
59-
v3_16 = "3.16"
60-
v3_18 = "3.18"
61-
v3_20 = "3.20"
62-
v3_22 = "3.22"
63-
v3_24 = "3.24"
58+
[package.metadata.system-deps.gdk_3_0.v3_16]
59+
version = "3.16"
60+
61+
[package.metadata.system-deps.gdk_3_0.v3_18]
62+
version = "3.18"
63+
64+
[package.metadata.system-deps.gdk_3_0.v3_20]
65+
version = "3.20"
66+
67+
[package.metadata.system-deps.gdk_3_0.v3_22]
68+
version = "3.22"
69+
70+
[package.metadata.system-deps.gdk_3_0.v3_24]
71+
version = "3.24"

‎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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

‎gdkx11/sys/Cargo.toml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ features = ["dox"]
1515
name = "gdk-x11-3.0"
1616
version = "3.14"
1717

18-
[package.metadata.system-deps.gdk_x11_3_0.feature-versions]
19-
v3_16 = "3.16"
20-
v3_24 = "3.24"
21-
v3_24_2 = "3.24.2"
18+
[package.metadata.system-deps.gdk_x11_3_0.v3_16]
19+
version = "3.16"
20+
21+
[package.metadata.system-deps.gdk_x11_3_0.v3_24]
22+
version = "3.24"
23+
24+
[package.metadata.system-deps.gdk_x11_3_0.v3_24_2]
25+
version = "3.24.2"
2226

2327
[lib]
2428
name = "gdk_x11_sys"
@@ -51,7 +55,7 @@ path = "../../cairo/sys"
5155
optional = true
5256

5357
[build-dependencies]
54-
system-deps = "1.3"
58+
system-deps = "2.0"
5559

5660
[dev-dependencies]
5761
shell-words = "1.0.0"

‎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 @ 7670e3d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)

0 commit comments

Comments
 (0)