Skip to content

Commit 97b10b7

Browse files
committed
glib-sys: re-generate bindings and tests
1 parent d794871 commit 97b10b7

File tree

3 files changed

+0
-118
lines changed

3 files changed

+0
-118
lines changed

glib/sys/src/lib.rs

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,66 +2195,6 @@ pub struct _GStatBuf {
21952195

21962196
pub type GStatBuf = _GStatBuf;
21972197

2198-
#[derive(Copy, Clone)]
2199-
#[repr(C)]
2200-
pub struct GStaticMutex {
2201-
pub mutex: *mut GMutex,
2202-
}
2203-
2204-
impl ::std::fmt::Debug for GStaticMutex {
2205-
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
2206-
f.debug_struct(&format!("GStaticMutex @ {self:p}"))
2207-
.field("mutex", &self.mutex)
2208-
.finish()
2209-
}
2210-
}
2211-
2212-
#[derive(Copy, Clone)]
2213-
#[repr(C)]
2214-
pub struct GStaticPrivate {
2215-
pub index: c_uint,
2216-
}
2217-
2218-
impl ::std::fmt::Debug for GStaticPrivate {
2219-
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
2220-
f.debug_struct(&format!("GStaticPrivate @ {self:p}"))
2221-
.finish()
2222-
}
2223-
}
2224-
2225-
#[derive(Copy, Clone)]
2226-
#[repr(C)]
2227-
pub struct GStaticRWLock {
2228-
pub mutex: GStaticMutex,
2229-
pub read_cond: *mut GCond,
2230-
pub write_cond: *mut GCond,
2231-
pub read_counter: c_uint,
2232-
pub have_writer: gboolean,
2233-
pub want_to_read: c_uint,
2234-
pub want_to_write: c_uint,
2235-
}
2236-
2237-
impl ::std::fmt::Debug for GStaticRWLock {
2238-
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
2239-
f.debug_struct(&format!("GStaticRWLock @ {self:p}"))
2240-
.finish()
2241-
}
2242-
}
2243-
2244-
#[derive(Copy, Clone)]
2245-
#[repr(C)]
2246-
pub struct GStaticRecMutex {
2247-
pub mutex: GStaticMutex,
2248-
pub depth: c_uint,
2249-
}
2250-
2251-
impl ::std::fmt::Debug for GStaticRecMutex {
2252-
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
2253-
f.debug_struct(&format!("GStaticRecMutex @ {self:p}"))
2254-
.finish()
2255-
}
2256-
}
2257-
22582198
#[derive(Copy, Clone)]
22592199
#[repr(C)]
22602200
pub struct GString {
@@ -5181,44 +5121,18 @@ extern "C" {
51815121
//=========================================================================
51825122
// GStaticMutex
51835123
//=========================================================================
5184-
pub fn g_static_mutex_free(mutex: *mut GStaticMutex);
5185-
pub fn g_static_mutex_get_mutex_impl(mutex: *mut GStaticMutex) -> *mut GMutex;
5186-
pub fn g_static_mutex_init(mutex: *mut GStaticMutex);
51875124

51885125
//=========================================================================
51895126
// GStaticPrivate
51905127
//=========================================================================
5191-
pub fn g_static_private_free(private_key: *mut GStaticPrivate);
5192-
pub fn g_static_private_get(private_key: *mut GStaticPrivate) -> gpointer;
5193-
pub fn g_static_private_init(private_key: *mut GStaticPrivate);
5194-
pub fn g_static_private_set(
5195-
private_key: *mut GStaticPrivate,
5196-
data: gpointer,
5197-
notify: GDestroyNotify,
5198-
);
51995128

52005129
//=========================================================================
52015130
// GStaticRWLock
52025131
//=========================================================================
5203-
pub fn g_static_rw_lock_free(lock: *mut GStaticRWLock);
5204-
pub fn g_static_rw_lock_init(lock: *mut GStaticRWLock);
5205-
pub fn g_static_rw_lock_reader_lock(lock: *mut GStaticRWLock);
5206-
pub fn g_static_rw_lock_reader_trylock(lock: *mut GStaticRWLock) -> gboolean;
5207-
pub fn g_static_rw_lock_reader_unlock(lock: *mut GStaticRWLock);
5208-
pub fn g_static_rw_lock_writer_lock(lock: *mut GStaticRWLock);
5209-
pub fn g_static_rw_lock_writer_trylock(lock: *mut GStaticRWLock) -> gboolean;
5210-
pub fn g_static_rw_lock_writer_unlock(lock: *mut GStaticRWLock);
52115132

52125133
//=========================================================================
52135134
// GStaticRecMutex
52145135
//=========================================================================
5215-
pub fn g_static_rec_mutex_free(mutex: *mut GStaticRecMutex);
5216-
pub fn g_static_rec_mutex_init(mutex: *mut GStaticRecMutex);
5217-
pub fn g_static_rec_mutex_lock(mutex: *mut GStaticRecMutex);
5218-
pub fn g_static_rec_mutex_lock_full(mutex: *mut GStaticRecMutex, depth: c_uint);
5219-
pub fn g_static_rec_mutex_trylock(mutex: *mut GStaticRecMutex) -> gboolean;
5220-
pub fn g_static_rec_mutex_unlock(mutex: *mut GStaticRecMutex);
5221-
pub fn g_static_rec_mutex_unlock_full(mutex: *mut GStaticRecMutex) -> c_uint;
52225136

52235137
//=========================================================================
52245138
// GString

glib/sys/tests/abi.rs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -733,34 +733,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
733733
alignment: align_of::<GSpawnFlags>(),
734734
},
735735
),
736-
(
737-
"GStaticMutex",
738-
Layout {
739-
size: size_of::<GStaticMutex>(),
740-
alignment: align_of::<GStaticMutex>(),
741-
},
742-
),
743-
(
744-
"GStaticPrivate",
745-
Layout {
746-
size: size_of::<GStaticPrivate>(),
747-
alignment: align_of::<GStaticPrivate>(),
748-
},
749-
),
750-
(
751-
"GStaticRWLock",
752-
Layout {
753-
size: size_of::<GStaticRWLock>(),
754-
alignment: align_of::<GStaticRWLock>(),
755-
},
756-
),
757-
(
758-
"GStaticRecMutex",
759-
Layout {
760-
size: size_of::<GStaticRecMutex>(),
761-
alignment: align_of::<GStaticRecMutex>(),
762-
},
763-
),
764736
(
765737
"GString",
766738
Layout {

glib/sys/tests/layout.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ int main() {
8383
printf("%s;%zu;%zu\n", "GSourceFuncs", sizeof(GSourceFuncs), alignof(GSourceFuncs));
8484
printf("%s;%zu;%zu\n", "GSpawnError", sizeof(GSpawnError), alignof(GSpawnError));
8585
printf("%s;%zu;%zu\n", "GSpawnFlags", sizeof(GSpawnFlags), alignof(GSpawnFlags));
86-
printf("%s;%zu;%zu\n", "GStaticMutex", sizeof(GStaticMutex), alignof(GStaticMutex));
87-
printf("%s;%zu;%zu\n", "GStaticPrivate", sizeof(GStaticPrivate), alignof(GStaticPrivate));
88-
printf("%s;%zu;%zu\n", "GStaticRWLock", sizeof(GStaticRWLock), alignof(GStaticRWLock));
89-
printf("%s;%zu;%zu\n", "GStaticRecMutex", sizeof(GStaticRecMutex), alignof(GStaticRecMutex));
9086
printf("%s;%zu;%zu\n", "GString", sizeof(GString), alignof(GString));
9187
printf("%s;%zu;%zu\n", "GStrv", sizeof(GStrv), alignof(GStrv));
9288
printf("%s;%zu;%zu\n", "GTestConfig", sizeof(GTestConfig), alignof(GTestConfig));

0 commit comments

Comments
 (0)