From 5f3b2f79cf6910bd936df22f88d85e864fe4cf17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?joseLu=C3=ADs?= Date: Thu, 6 May 2021 14:40:12 +0200 Subject: [PATCH] [rust] fix bindgen imports - update blacklist rules - use ffi `__va_list_tags` --- rust/build/build.rs | 12 +++++++++--- rust/src/plane/reimplemented.rs | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rust/build/build.rs b/rust/build/build.rs index a5399909b..f2a94433a 100644 --- a/rust/build/build.rs +++ b/rust/build/build.rs @@ -30,11 +30,17 @@ fn main() { .generate_comments(true) .clang_arg("-fretain-comments-from-system-headers") .clang_arg("-fparse-all-comments") + // Remove warnings about improper_ctypes + .blacklist_function("strtold") + .blacklist_function("wcstold") + .blacklist_function("socketpair") // only import functions from notcurses public API - .blacklist_function("[^n].*") + .blacklist_function("[^ns].*") .blacklist_function("n[^co].*") - // clean more unneeded types - .blacklist_item("_[A-FHJ-Z].*") + .blacklist_function("s[^i].*") // allow sig* + // clean more unneeded types + .blacklist_item("_BITS.*") + .blacklist_item("_POSIX.*") .blacklist_item("__[A-Z].*") .blacklist_item("[ADHJ-MQ-Z].*") .blacklist_item("IP[^R].*") diff --git a/rust/src/plane/reimplemented.rs b/rust/src/plane/reimplemented.rs index 2296a7327..cacba4777 100644 --- a/rust/src/plane/reimplemented.rs +++ b/rust/src/plane/reimplemented.rs @@ -2,7 +2,7 @@ use core::ptr::null_mut; -use crate::__va_list_tag; +use crate::ffi::__va_list_tag; use crate::{ cstring, nccell_release, NcAlign, NcAlphaBits, NcBoxMask, NcCell, NcChannel, NcChannelPair, NcColor, NcDim, NcEgc, NcIntResult, NcPlane, NcRgb, NcStyleMask, NCRESULT_ERR, NCRESULT_OK,