Skip to content

Commit 4758270

Browse files
committed
Regenerate with latest gir
1 parent b674907 commit 4758270

31 files changed

+70
-268
lines changed

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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

gio/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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

gio/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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

glib/gobject-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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

glib/src/auto/source.rs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// from gir-files (https://github.com/gtk-rs/gir-files)
33
// DO NOT EDIT
44

5-
use crate::{ffi, translate::*, MainContext};
5+
use crate::{ffi, translate::*};
66

77
crate::wrapper! {
88
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -45,25 +45,12 @@ impl Source {
4545
}
4646
}
4747

48-
#[cfg(feature = "v2_86")]
49-
#[cfg_attr(docsrs, doc(cfg(feature = "v2_86")))]
50-
#[doc(alias = "g_source_dup_context")]
51-
pub fn dup_context(&self) -> Option<MainContext> {
52-
unsafe { from_glib_full(ffi::g_source_dup_context(self.to_glib_none().0)) }
53-
}
54-
5548
#[doc(alias = "g_source_get_can_recurse")]
5649
#[doc(alias = "get_can_recurse")]
5750
pub fn can_recurse(&self) -> bool {
5851
unsafe { from_glib(ffi::g_source_get_can_recurse(self.to_glib_none().0)) }
5952
}
6053

61-
#[doc(alias = "g_source_get_context")]
62-
#[doc(alias = "get_context")]
63-
pub fn context(&self) -> Option<MainContext> {
64-
unsafe { from_glib_none(ffi::g_source_get_context(self.to_glib_none().0)) }
65-
}
66-
6754
#[doc(alias = "g_source_get_name")]
6855
#[doc(alias = "get_name")]
6956
pub fn name(&self) -> Option<crate::GString> {

glib/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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

glib/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 @ 1364a207b03e)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b2a1c6f9b362)
22
from gir-files (https://github.com/gtk-rs/gir-files @ 5262e0fefdc7)

graphene/src/auto/box_.rs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,17 @@ glib::wrapper! {
1818
impl Box {
1919
#[doc(alias = "graphene_box_contains_box")]
2020
pub fn contains_box(&self, b: &Box) -> bool {
21-
unsafe {
22-
from_glib(ffi::graphene_box_contains_box(
23-
self.to_glib_none().0,
24-
b.to_glib_none().0,
25-
))
26-
}
21+
unsafe { ffi::graphene_box_contains_box(self.to_glib_none().0, b.to_glib_none().0) }
2722
}
2823

2924
#[doc(alias = "graphene_box_contains_point")]
3025
pub fn contains_point(&self, point: &Point3D) -> bool {
31-
unsafe {
32-
from_glib(ffi::graphene_box_contains_point(
33-
self.to_glib_none().0,
34-
point.to_glib_none().0,
35-
))
36-
}
26+
unsafe { ffi::graphene_box_contains_point(self.to_glib_none().0, point.to_glib_none().0) }
3727
}
3828

3929
#[doc(alias = "graphene_box_equal")]
4030
fn equal(&self, b: &Box) -> bool {
41-
unsafe {
42-
from_glib(ffi::graphene_box_equal(
43-
self.to_glib_none().0,
44-
b.to_glib_none().0,
45-
))
46-
}
31+
unsafe { ffi::graphene_box_equal(self.to_glib_none().0, b.to_glib_none().0) }
4732
}
4833

4934
#[doc(alias = "graphene_box_expand")]
@@ -180,11 +165,11 @@ impl Box {
180165
pub fn intersection(&self, b: &Box) -> Option<Box> {
181166
unsafe {
182167
let mut res = Box::uninitialized();
183-
let ret = from_glib(ffi::graphene_box_intersection(
168+
let ret = ffi::graphene_box_intersection(
184169
self.to_glib_none().0,
185170
b.to_glib_none().0,
186171
res.to_glib_none_mut().0,
187-
));
172+
);
188173
if ret {
189174
Some(res)
190175
} else {

graphene/src/auto/euler.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@ glib::wrapper! {
1818
impl Euler {
1919
#[doc(alias = "graphene_euler_equal")]
2020
fn equal(&self, b: &Euler) -> bool {
21-
unsafe {
22-
from_glib(ffi::graphene_euler_equal(
23-
self.to_glib_none().0,
24-
b.to_glib_none().0,
25-
))
26-
}
21+
unsafe { ffi::graphene_euler_equal(self.to_glib_none().0, b.to_glib_none().0) }
2722
}
2823

2924
#[doc(alias = "graphene_euler_get_alpha")]

graphene/src/auto/frustum.rs

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,26 @@ impl Frustum {
1919
#[doc(alias = "graphene_frustum_contains_point")]
2020
pub fn contains_point(&self, point: &Point3D) -> bool {
2121
unsafe {
22-
from_glib(ffi::graphene_frustum_contains_point(
23-
self.to_glib_none().0,
24-
point.to_glib_none().0,
25-
))
22+
ffi::graphene_frustum_contains_point(self.to_glib_none().0, point.to_glib_none().0)
2623
}
2724
}
2825

2926
#[doc(alias = "graphene_frustum_equal")]
3027
fn equal(&self, b: &Frustum) -> bool {
31-
unsafe {
32-
from_glib(ffi::graphene_frustum_equal(
33-
self.to_glib_none().0,
34-
b.to_glib_none().0,
35-
))
36-
}
28+
unsafe { ffi::graphene_frustum_equal(self.to_glib_none().0, b.to_glib_none().0) }
3729
}
3830

3931
#[doc(alias = "graphene_frustum_intersects_box")]
4032
pub fn intersects_box(&self, box_: &Box) -> bool {
4133
unsafe {
42-
from_glib(ffi::graphene_frustum_intersects_box(
43-
self.to_glib_none().0,
44-
box_.to_glib_none().0,
45-
))
34+
ffi::graphene_frustum_intersects_box(self.to_glib_none().0, box_.to_glib_none().0)
4635
}
4736
}
4837

4938
#[doc(alias = "graphene_frustum_intersects_sphere")]
5039
pub fn intersects_sphere(&self, sphere: &Sphere) -> bool {
5140
unsafe {
52-
from_glib(ffi::graphene_frustum_intersects_sphere(
53-
self.to_glib_none().0,
54-
sphere.to_glib_none().0,
55-
))
41+
ffi::graphene_frustum_intersects_sphere(self.to_glib_none().0, sphere.to_glib_none().0)
5642
}
5743
}
5844
}

graphene/src/auto/matrix.rs

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ impl Matrix {
2424
let mut rotate = Quaternion::uninitialized();
2525
let mut shear = Vec3::uninitialized();
2626
let mut perspective = Vec4::uninitialized();
27-
let ret = from_glib(ffi::graphene_matrix_decompose(
27+
let ret = ffi::graphene_matrix_decompose(
2828
self.to_glib_none().0,
2929
translate.to_glib_none_mut().0,
3030
scale.to_glib_none_mut().0,
3131
rotate.to_glib_none_mut().0,
3232
shear.to_glib_none_mut().0,
3333
perspective.to_glib_none_mut().0,
34-
));
34+
);
3535
if ret {
3636
Some((translate, scale, rotate, shear, perspective))
3737
} else {
@@ -47,22 +47,12 @@ impl Matrix {
4747

4848
#[doc(alias = "graphene_matrix_equal")]
4949
fn equal(&self, b: &Matrix) -> bool {
50-
unsafe {
51-
from_glib(ffi::graphene_matrix_equal(
52-
self.to_glib_none().0,
53-
b.to_glib_none().0,
54-
))
55-
}
50+
unsafe { ffi::graphene_matrix_equal(self.to_glib_none().0, b.to_glib_none().0) }
5651
}
5752

5853
#[doc(alias = "graphene_matrix_equal_fast")]
5954
pub fn equal_fast(&self, b: &Matrix) -> bool {
60-
unsafe {
61-
from_glib(ffi::graphene_matrix_equal_fast(
62-
self.to_glib_none().0,
63-
b.to_glib_none().0,
64-
))
65-
}
55+
unsafe { ffi::graphene_matrix_equal_fast(self.to_glib_none().0, b.to_glib_none().0) }
6656
}
6757

6858
#[doc(alias = "graphene_matrix_get_row")]
@@ -136,10 +126,7 @@ impl Matrix {
136126
pub fn inverse(&self) -> Option<Matrix> {
137127
unsafe {
138128
let mut res = Matrix::uninitialized();
139-
let ret = from_glib(ffi::graphene_matrix_inverse(
140-
self.to_glib_none().0,
141-
res.to_glib_none_mut().0,
142-
));
129+
let ret = ffi::graphene_matrix_inverse(self.to_glib_none().0, res.to_glib_none_mut().0);
143130
if ret {
144131
Some(res)
145132
} else {
@@ -150,26 +137,22 @@ impl Matrix {
150137

151138
#[doc(alias = "graphene_matrix_is_2d")]
152139
pub fn is_2d(&self) -> bool {
153-
unsafe { from_glib(ffi::graphene_matrix_is_2d(self.to_glib_none().0)) }
140+
unsafe { ffi::graphene_matrix_is_2d(self.to_glib_none().0) }
154141
}
155142

156143
#[doc(alias = "graphene_matrix_is_backface_visible")]
157144
pub fn is_backface_visible(&self) -> bool {
158-
unsafe {
159-
from_glib(ffi::graphene_matrix_is_backface_visible(
160-
self.to_glib_none().0,
161-
))
162-
}
145+
unsafe { ffi::graphene_matrix_is_backface_visible(self.to_glib_none().0) }
163146
}
164147

165148
#[doc(alias = "graphene_matrix_is_identity")]
166149
pub fn is_identity(&self) -> bool {
167-
unsafe { from_glib(ffi::graphene_matrix_is_identity(self.to_glib_none().0)) }
150+
unsafe { ffi::graphene_matrix_is_identity(self.to_glib_none().0) }
168151
}
169152

170153
#[doc(alias = "graphene_matrix_is_singular")]
171154
pub fn is_singular(&self) -> bool {
172-
unsafe { from_glib(ffi::graphene_matrix_is_singular(self.to_glib_none().0)) }
155+
unsafe { ffi::graphene_matrix_is_singular(self.to_glib_none().0) }
173156
}
174157

175158
#[doc(alias = "graphene_matrix_multiply")]
@@ -188,13 +171,7 @@ impl Matrix {
188171

189172
#[doc(alias = "graphene_matrix_near")]
190173
pub fn near(&self, b: &Matrix, epsilon: f32) -> bool {
191-
unsafe {
192-
from_glib(ffi::graphene_matrix_near(
193-
self.to_glib_none().0,
194-
b.to_glib_none().0,
195-
epsilon,
196-
))
197-
}
174+
unsafe { ffi::graphene_matrix_near(self.to_glib_none().0, b.to_glib_none().0, epsilon) }
198175
}
199176

200177
#[doc(alias = "graphene_matrix_normalize")]
@@ -346,15 +323,15 @@ impl Matrix {
346323
let mut yy = std::mem::MaybeUninit::uninit();
347324
let mut x_0 = std::mem::MaybeUninit::uninit();
348325
let mut y_0 = std::mem::MaybeUninit::uninit();
349-
let ret = from_glib(ffi::graphene_matrix_to_2d(
326+
let ret = ffi::graphene_matrix_to_2d(
350327
self.to_glib_none().0,
351328
xx.as_mut_ptr(),
352329
yx.as_mut_ptr(),
353330
xy.as_mut_ptr(),
354331
yy.as_mut_ptr(),
355332
x_0.as_mut_ptr(),
356333
y_0.as_mut_ptr(),
357-
));
334+
);
358335
if ret {
359336
Some((
360337
xx.assume_init(),
@@ -536,12 +513,12 @@ impl Matrix {
536513
pub fn untransform_point(&self, p: &Point, bounds: &Rect) -> Option<Point> {
537514
unsafe {
538515
let mut res = Point::uninitialized();
539-
let ret = from_glib(ffi::graphene_matrix_untransform_point(
516+
let ret = ffi::graphene_matrix_untransform_point(
540517
self.to_glib_none().0,
541518
p.to_glib_none().0,
542519
bounds.to_glib_none().0,
543520
res.to_glib_none_mut().0,
544-
));
521+
);
545522
if ret {
546523
Some(res)
547524
} else {

graphene/src/auto/plane.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ impl Plane {
2323

2424
#[doc(alias = "graphene_plane_equal")]
2525
fn equal(&self, b: &Plane) -> bool {
26-
unsafe {
27-
from_glib(ffi::graphene_plane_equal(
28-
self.to_glib_none().0,
29-
b.to_glib_none().0,
30-
))
31-
}
26+
unsafe { ffi::graphene_plane_equal(self.to_glib_none().0, b.to_glib_none().0) }
3227
}
3328

3429
#[doc(alias = "graphene_plane_get_constant")]

graphene/src/auto/point.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,7 @@ impl Point {
4040

4141
#[doc(alias = "graphene_point_equal")]
4242
fn equal(&self, b: &Point) -> bool {
43-
unsafe {
44-
from_glib(ffi::graphene_point_equal(
45-
self.to_glib_none().0,
46-
b.to_glib_none().0,
47-
))
48-
}
43+
unsafe { ffi::graphene_point_equal(self.to_glib_none().0, b.to_glib_none().0) }
4944
}
5045

5146
#[doc(alias = "graphene_point_interpolate")]
@@ -65,13 +60,7 @@ impl Point {
6560

6661
#[doc(alias = "graphene_point_near")]
6762
pub fn near(&self, b: &Point, epsilon: f32) -> bool {
68-
unsafe {
69-
from_glib(ffi::graphene_point_near(
70-
self.to_glib_none().0,
71-
b.to_glib_none().0,
72-
epsilon,
73-
))
74-
}
63+
unsafe { ffi::graphene_point_near(self.to_glib_none().0, b.to_glib_none().0, epsilon) }
7564
}
7665

7766
#[doc(alias = "graphene_point_to_vec2")]

graphene/src/auto/point3_d.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ impl Point3D {
5050

5151
#[doc(alias = "graphene_point3d_equal")]
5252
fn equal(&self, b: &Point3D) -> bool {
53-
unsafe {
54-
from_glib(ffi::graphene_point3d_equal(
55-
self.to_glib_none().0,
56-
b.to_glib_none().0,
57-
))
58-
}
53+
unsafe { ffi::graphene_point3d_equal(self.to_glib_none().0, b.to_glib_none().0) }
5954
}
6055

6156
#[doc(alias = "graphene_point3d_interpolate")]
@@ -80,13 +75,7 @@ impl Point3D {
8075

8176
#[doc(alias = "graphene_point3d_near")]
8277
pub fn near(&self, b: &Point3D, epsilon: f32) -> bool {
83-
unsafe {
84-
from_glib(ffi::graphene_point3d_near(
85-
self.to_glib_none().0,
86-
b.to_glib_none().0,
87-
epsilon,
88-
))
89-
}
78+
unsafe { ffi::graphene_point3d_near(self.to_glib_none().0, b.to_glib_none().0, epsilon) }
9079
}
9180

9281
#[doc(alias = "graphene_point3d_normalize")]

graphene/src/auto/quad.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ impl Quad {
2727

2828
#[doc(alias = "graphene_quad_contains")]
2929
pub fn contains(&self, p: &Point) -> bool {
30-
unsafe {
31-
from_glib(ffi::graphene_quad_contains(
32-
self.to_glib_none().0,
33-
p.to_glib_none().0,
34-
))
35-
}
30+
unsafe { ffi::graphene_quad_contains(self.to_glib_none().0, p.to_glib_none().0) }
3631
}
3732
}

0 commit comments

Comments
 (0)