glib-sys: ignore some unsupported types

Author: jf2048

glib/sys/Gir.toml

@@ -77,10 +77,25 @@ status = "generate"
     name = "get_user_state_dir"
     version = "2.72"
 
+[[object]]
+name = "GLib.LOG_DOMAIN"
+# C-only macro
+status = "ignore"
+
 [[object]]
 name = "GLib.Pid"
 status = "manual"
 
 [[object]]
 name = "GLib.PollFD"
 status = "manual"
+
+[[object]]
+name = "GLib.TestLogMsg"
+# layout is broken due to rust having no long double
+status = "ignore"
+
+[[object]]
+name = "GLib.macro__has_attribute___noreturn__"
+# C-only macro
+status = "ignore"

glib/sys/src/lib.rs

@@ -752,7 +752,6 @@ pub const G_LITTLE_ENDIAN: c_int = 1234;
 pub const G_LN10: c_double = 2.302585;
 pub const G_LN2: c_double = 0.693147;
 pub const G_LOG_2_BASE_10: c_double = 0.301030;
-pub const G_LOG_DOMAIN: c_char = 0;
 pub const G_LOG_FATAL_MASK: c_int = 5;
 pub const G_LOG_LEVEL_USER_SHIFT: c_int = 8;
 pub const G_OPTION_REMAINING: *const c_char = b"\0" as *const u8 as *const c_char;
@@ -789,7 +788,6 @@ pub const G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS: *const c_char =
     b"!$&'()*+,;=\0" as *const u8 as *const c_char;
 pub const G_USEC_PER_SEC: c_int = 1000000;
 pub const G_WIN32_MSG_HANDLE: c_int = 19981206;
-pub const g_macro__has_attribute___noreturn__: c_int = 0;
 
 // Flags
 pub type GAsciiType = c_uint;
@@ -2185,27 +2183,6 @@ impl ::std::fmt::Debug for GTestLogBuffer {
     }
 }
 
-#[repr(C)]
-pub struct GTestLogMsg {
-    pub log_type: GTestLogType,
-    pub n_strings: c_uint,
-    pub strings: *mut *mut c_char,
-    pub n_nums: c_uint,
-    _truncated_record_marker: c_void,
-    // /*Unimplemented*/*mut long double
-}
-
-impl ::std::fmt::Debug for GTestLogMsg {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("GTestLogMsg @ {self:p}"))
-            .field("log_type", &self.log_type)
-            .field("n_strings", &self.n_strings)
-            .field("strings", &self.strings)
-            .field("n_nums", &self.n_nums)
-            .finish()
-    }
-}
-
 #[repr(C)]
 pub struct _GTestSuite {
     _data: [u8; 0],
@@ -4808,14 +4785,14 @@ extern "C" {
     // GTestLogBuffer
     //=========================================================================
     pub fn g_test_log_buffer_free(tbuffer: *mut GTestLogBuffer);
-    pub fn g_test_log_buffer_pop(tbuffer: *mut GTestLogBuffer) -> *mut GTestLogMsg;
+    //pub fn g_test_log_buffer_pop(tbuffer: *mut GTestLogBuffer) -> /*Ignored*/*mut GTestLogMsg;
     pub fn g_test_log_buffer_push(tbuffer: *mut GTestLogBuffer, n_bytes: c_uint, bytes: *const u8);
     pub fn g_test_log_buffer_new() -> *mut GTestLogBuffer;
 
     //=========================================================================
     // GTestLogMsg
     //=========================================================================
-    pub fn g_test_log_msg_free(tmsg: *mut GTestLogMsg);
+    //pub fn g_test_log_msg_free(tmsg: /*Ignored*/*mut GTestLogMsg);
 
     //=========================================================================
     // GTestSuite

glib/sys/tests/abi.rs

@@ -750,13 +750,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
             alignment: align_of::<GTestLogBuffer>(),
         },
     ),
-    (
-        "GTestLogMsg",
-        Layout {
-            size: size_of::<GTestLogMsg>(),
-            alignment: align_of::<GTestLogMsg>(),
-        },
-    ),
     (
         "GTestLogType",
         Layout {
@@ -1169,7 +1162,6 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("G_LN10", "2.302585"),
     ("G_LN2", "0.693147"),
     ("G_LOG_2_BASE_10", "0.301030"),
-    ("G_LOG_DOMAIN", "0"),
     ("G_LOG_FATAL_MASK", "5"),
     ("(guint) G_LOG_FLAG_FATAL", "2"),
     ("(guint) G_LOG_FLAG_RECURSION", "1"),
@@ -1809,5 +1801,4 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ),
     ("(gint) G_VARIANT_PARSE_ERROR_VALUE_EXPECTED", "17"),
     ("G_WIN32_MSG_HANDLE", "19981206"),
-    ("g_macro__has_attribute___noreturn__", "0"),
 ];

glib/sys/tests/constant.c

@@ -227,7 +227,6 @@ int main() {
     PRINT_CONSTANT(G_LN10);
     PRINT_CONSTANT(G_LN2);
     PRINT_CONSTANT(G_LOG_2_BASE_10);
-    PRINT_CONSTANT(G_LOG_DOMAIN);
     PRINT_CONSTANT(G_LOG_FATAL_MASK);
     PRINT_CONSTANT((guint) G_LOG_FLAG_FATAL);
     PRINT_CONSTANT((guint) G_LOG_FLAG_RECURSION);
@@ -834,6 +833,5 @@ int main() {
     PRINT_CONSTANT((gint) G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT);
     PRINT_CONSTANT((gint) G_VARIANT_PARSE_ERROR_VALUE_EXPECTED);
     PRINT_CONSTANT(G_WIN32_MSG_HANDLE);
-    PRINT_CONSTANT(g_macro__has_attribute___noreturn__);
     return 0;
 }

glib/sys/tests/layout.c

@@ -86,7 +86,6 @@ int main() {
     printf("%s;%zu;%zu\n", "GTestConfig", sizeof(GTestConfig), alignof(GTestConfig));
     printf("%s;%zu;%zu\n", "GTestFileType", sizeof(GTestFileType), alignof(GTestFileType));
     printf("%s;%zu;%zu\n", "GTestLogBuffer", sizeof(GTestLogBuffer), alignof(GTestLogBuffer));
-    printf("%s;%zu;%zu\n", "GTestLogMsg", sizeof(GTestLogMsg), alignof(GTestLogMsg));
     printf("%s;%zu;%zu\n", "GTestLogType", sizeof(GTestLogType), alignof(GTestLogType));
     printf("%s;%zu;%zu\n", "GTestResult", sizeof(GTestResult), alignof(GTestResult));
     printf("%s;%zu;%zu\n", "GTestSubprocessFlags", sizeof(GTestSubprocessFlags), alignof(GTestSubprocessFlags));