[bindings] Use new non-null annotation feature in cbindgen

[rust-lightning] / c-bindings-gen / src / main.rs

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 9f86579a748c63ac8522e5149ee183806dd8487d..c74344321f4bf4a17424edcc1695f594f1580fb2 100644 (file)
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -1555,10 +1555,18 @@ fn main() {
        let mut cpp_header_file = std::fs::OpenOptions::new().write(true).create(true).truncate(true)
                .open(&args[6]).expect("Unable to open new header file");
 
-       writeln!(header_file, "#if defined(__GNUC__)\n#define MUST_USE_STRUCT __attribute__((warn_unused))").unwrap();
-       writeln!(header_file, "#else\n#define MUST_USE_STRUCT\n#endif").unwrap();
-       writeln!(header_file, "#if defined(__GNUC__)\n#define MUST_USE_RES __attribute__((warn_unused_result))").unwrap();
-       writeln!(header_file, "#else\n#define MUST_USE_RES\n#endif").unwrap();
+       writeln!(header_file, "#if defined(__GNUC__)").unwrap();
+       writeln!(header_file, "#define MUST_USE_STRUCT __attribute__((warn_unused))").unwrap();
+       writeln!(header_file, "#define MUST_USE_RES __attribute__((warn_unused_result))").unwrap();
+       writeln!(header_file, "#else").unwrap();
+       writeln!(header_file, "#define MUST_USE_STRUCT").unwrap();
+       writeln!(header_file, "#define MUST_USE_RES").unwrap();
+       writeln!(header_file, "#endif").unwrap();
+       writeln!(header_file, "#if defined(__clang__)").unwrap();
+       writeln!(header_file, "#define NONNULL_PTR _Nonnull").unwrap();
+       writeln!(header_file, "#else").unwrap();
+       writeln!(header_file, "#define NONNULL_PTR").unwrap();
+       writeln!(header_file, "#endif").unwrap();
        writeln!(cpp_header_file, "#include <string.h>\nnamespace LDK {{").unwrap();
 
        // First parse the full crate's ASTs, caching them so that we can hold references to the AST