From afd4a05d4e8d4797beb1111ff5b60e625a2ffe83 Mon Sep 17 00:00:00 2001 From: Nick Wilcox Date: Wed, 5 Aug 2020 09:04:24 +0000 Subject: [PATCH] update nonnull expectations --- tests/expectations/both/nonnull_attribute.c | 30 +++++++++---------- .../both/nonnull_attribute.compat.c | 30 +++++++++---------- tests/expectations/nonnull_attribute.c | 30 +++++++++---------- tests/expectations/nonnull_attribute.compat.c | 30 +++++++++---------- tests/expectations/nonnull_attribute.cpp | 30 +++++++++---------- tests/expectations/tag/nonnull_attribute.c | 30 +++++++++---------- .../tag/nonnull_attribute.compat.c | 30 +++++++++---------- 7 files changed, 105 insertions(+), 105 deletions(-) diff --git a/tests/expectations/both/nonnull_attribute.c b/tests/expectations/both/nonnull_attribute.c index 6c4c1e2..ffd8063 100644 --- a/tests/expectations/both/nonnull_attribute.c +++ b/tests/expectations/both/nonnull_attribute.c @@ -13,40 +13,40 @@ typedef struct Opaque Opaque; typedef struct Pointers_u64 { - float * CBINDGEN_NONNULL a; - uint64_t * CBINDGEN_NONNULL b; - Opaque * CBINDGEN_NONNULL c; - uint64_t * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + uint64_t *CBINDGEN_NONNULL b; + Opaque *CBINDGEN_NONNULL c; + uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; uint64_t *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const uint64_t *j; uint64_t *k; } Pointers_u64; typedef struct References { - const Opaque * CBINDGEN_NONNULL a; - Opaque * CBINDGEN_NONNULL b; + const Opaque *CBINDGEN_NONNULL a; + Opaque *CBINDGEN_NONNULL b; const Opaque *c; Opaque *d; } References; -void mut_ref_arg(const Pointers_u64 * CBINDGEN_NONNULL arg); +void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, Pointers_u64 *foo, - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const Pointers_u64 *arg); void nullable_mut_ptr(Pointers_u64 *arg); -void optional_mut_ref_arg(const Pointers_u64 *arg); +void optional_mut_ref_arg(Pointers_u64 *arg); -void optional_ref_arg(Pointers_u64 *arg); +void optional_ref_arg(const Pointers_u64 *arg); -void ref_arg(Pointers_u64 * CBINDGEN_NONNULL arg); +void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg); void value_arg(References arg); diff --git a/tests/expectations/both/nonnull_attribute.compat.c b/tests/expectations/both/nonnull_attribute.compat.c index dc572d2..75d0c02 100644 --- a/tests/expectations/both/nonnull_attribute.compat.c +++ b/tests/expectations/both/nonnull_attribute.compat.c @@ -13,22 +13,22 @@ typedef struct Opaque Opaque; typedef struct Pointers_u64 { - float * CBINDGEN_NONNULL a; - uint64_t * CBINDGEN_NONNULL b; - Opaque * CBINDGEN_NONNULL c; - uint64_t * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + uint64_t *CBINDGEN_NONNULL b; + Opaque *CBINDGEN_NONNULL c; + uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; uint64_t *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const uint64_t *j; uint64_t *k; } Pointers_u64; typedef struct References { - const Opaque * CBINDGEN_NONNULL a; - Opaque * CBINDGEN_NONNULL b; + const Opaque *CBINDGEN_NONNULL a; + Opaque *CBINDGEN_NONNULL b; const Opaque *c; Opaque *d; } References; @@ -37,21 +37,21 @@ typedef struct References { extern "C" { #endif // __cplusplus -void mut_ref_arg(const Pointers_u64 * CBINDGEN_NONNULL arg); +void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, Pointers_u64 *foo, - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const Pointers_u64 *arg); void nullable_mut_ptr(Pointers_u64 *arg); -void optional_mut_ref_arg(const Pointers_u64 *arg); +void optional_mut_ref_arg(Pointers_u64 *arg); -void optional_ref_arg(Pointers_u64 *arg); +void optional_ref_arg(const Pointers_u64 *arg); -void ref_arg(Pointers_u64 * CBINDGEN_NONNULL arg); +void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg); void value_arg(References arg); diff --git a/tests/expectations/nonnull_attribute.c b/tests/expectations/nonnull_attribute.c index e644970..08488a2 100644 --- a/tests/expectations/nonnull_attribute.c +++ b/tests/expectations/nonnull_attribute.c @@ -13,40 +13,40 @@ typedef struct Opaque Opaque; typedef struct { - float * CBINDGEN_NONNULL a; - uint64_t * CBINDGEN_NONNULL b; - Opaque * CBINDGEN_NONNULL c; - uint64_t * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + uint64_t *CBINDGEN_NONNULL b; + Opaque *CBINDGEN_NONNULL c; + uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; uint64_t *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const uint64_t *j; uint64_t *k; } Pointers_u64; typedef struct { - const Opaque * CBINDGEN_NONNULL a; - Opaque * CBINDGEN_NONNULL b; + const Opaque *CBINDGEN_NONNULL a; + Opaque *CBINDGEN_NONNULL b; const Opaque *c; Opaque *d; } References; -void mut_ref_arg(const Pointers_u64 * CBINDGEN_NONNULL arg); +void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, Pointers_u64 *foo, - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const Pointers_u64 *arg); void nullable_mut_ptr(Pointers_u64 *arg); -void optional_mut_ref_arg(const Pointers_u64 *arg); +void optional_mut_ref_arg(Pointers_u64 *arg); -void optional_ref_arg(Pointers_u64 *arg); +void optional_ref_arg(const Pointers_u64 *arg); -void ref_arg(Pointers_u64 * CBINDGEN_NONNULL arg); +void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg); void value_arg(References arg); diff --git a/tests/expectations/nonnull_attribute.compat.c b/tests/expectations/nonnull_attribute.compat.c index 991c652..a49fae5 100644 --- a/tests/expectations/nonnull_attribute.compat.c +++ b/tests/expectations/nonnull_attribute.compat.c @@ -13,22 +13,22 @@ typedef struct Opaque Opaque; typedef struct { - float * CBINDGEN_NONNULL a; - uint64_t * CBINDGEN_NONNULL b; - Opaque * CBINDGEN_NONNULL c; - uint64_t * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + uint64_t *CBINDGEN_NONNULL b; + Opaque *CBINDGEN_NONNULL c; + uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; uint64_t *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const uint64_t *j; uint64_t *k; } Pointers_u64; typedef struct { - const Opaque * CBINDGEN_NONNULL a; - Opaque * CBINDGEN_NONNULL b; + const Opaque *CBINDGEN_NONNULL a; + Opaque *CBINDGEN_NONNULL b; const Opaque *c; Opaque *d; } References; @@ -37,21 +37,21 @@ typedef struct { extern "C" { #endif // __cplusplus -void mut_ref_arg(const Pointers_u64 * CBINDGEN_NONNULL arg); +void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, Pointers_u64 *foo, - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const Pointers_u64 *arg); void nullable_mut_ptr(Pointers_u64 *arg); -void optional_mut_ref_arg(const Pointers_u64 *arg); +void optional_mut_ref_arg(Pointers_u64 *arg); -void optional_ref_arg(Pointers_u64 *arg); +void optional_ref_arg(const Pointers_u64 *arg); -void ref_arg(Pointers_u64 * CBINDGEN_NONNULL arg); +void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg); void value_arg(References arg); diff --git a/tests/expectations/nonnull_attribute.cpp b/tests/expectations/nonnull_attribute.cpp index 524d506..e689b96 100644 --- a/tests/expectations/nonnull_attribute.cpp +++ b/tests/expectations/nonnull_attribute.cpp @@ -14,43 +14,43 @@ struct Opaque; template struct Pointers { - float * CBINDGEN_NONNULL a; - T * CBINDGEN_NONNULL b; - Opaque * CBINDGEN_NONNULL c; - T * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + T *CBINDGEN_NONNULL b; + Opaque *CBINDGEN_NONNULL c; + T *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; T *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const T *j; T *k; }; struct References { - const Opaque * CBINDGEN_NONNULL a; - Opaque * CBINDGEN_NONNULL b; + const Opaque *CBINDGEN_NONNULL a; + Opaque *CBINDGEN_NONNULL b; const Opaque *c; Opaque *d; }; extern "C" { -void mut_ref_arg(const Pointers * CBINDGEN_NONNULL arg); +void mut_ref_arg(Pointers *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, Pointers *foo, - Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const Pointers *arg); void nullable_mut_ptr(Pointers *arg); -void optional_mut_ref_arg(const Pointers *arg); +void optional_mut_ref_arg(Pointers *arg); -void optional_ref_arg(Pointers *arg); +void optional_ref_arg(const Pointers *arg); -void ref_arg(Pointers * CBINDGEN_NONNULL arg); +void ref_arg(const Pointers *CBINDGEN_NONNULL arg); void value_arg(References arg); diff --git a/tests/expectations/tag/nonnull_attribute.c b/tests/expectations/tag/nonnull_attribute.c index 91f2c79..583c3df 100644 --- a/tests/expectations/tag/nonnull_attribute.c +++ b/tests/expectations/tag/nonnull_attribute.c @@ -13,40 +13,40 @@ struct Opaque; struct Pointers_u64 { - float * CBINDGEN_NONNULL a; - uint64_t * CBINDGEN_NONNULL b; - struct Opaque * CBINDGEN_NONNULL c; - uint64_t * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - struct Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + uint64_t *CBINDGEN_NONNULL b; + struct Opaque *CBINDGEN_NONNULL c; + uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; uint64_t *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const uint64_t *j; uint64_t *k; }; struct References { - const struct Opaque * CBINDGEN_NONNULL a; - struct Opaque * CBINDGEN_NONNULL b; + const struct Opaque *CBINDGEN_NONNULL a; + struct Opaque *CBINDGEN_NONNULL b; const struct Opaque *c; struct Opaque *d; }; -void mut_ref_arg(const struct Pointers_u64 * CBINDGEN_NONNULL arg); +void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, struct Pointers_u64 *foo, - struct Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const struct Pointers_u64 *arg); void nullable_mut_ptr(struct Pointers_u64 *arg); -void optional_mut_ref_arg(const struct Pointers_u64 *arg); +void optional_mut_ref_arg(struct Pointers_u64 *arg); -void optional_ref_arg(struct Pointers_u64 *arg); +void optional_ref_arg(const struct Pointers_u64 *arg); -void ref_arg(struct Pointers_u64 * CBINDGEN_NONNULL arg); +void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg); void value_arg(struct References arg); diff --git a/tests/expectations/tag/nonnull_attribute.compat.c b/tests/expectations/tag/nonnull_attribute.compat.c index ef0a8fa..64e52ac 100644 --- a/tests/expectations/tag/nonnull_attribute.compat.c +++ b/tests/expectations/tag/nonnull_attribute.compat.c @@ -13,22 +13,22 @@ struct Opaque; struct Pointers_u64 { - float * CBINDGEN_NONNULL a; - uint64_t * CBINDGEN_NONNULL b; - struct Opaque * CBINDGEN_NONNULL c; - uint64_t * CBINDGEN_NONNULL * CBINDGEN_NONNULL d; - float * CBINDGEN_NONNULL * CBINDGEN_NONNULL e; - struct Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL f; + float *CBINDGEN_NONNULL a; + uint64_t *CBINDGEN_NONNULL b; + struct Opaque *CBINDGEN_NONNULL c; + uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d; + float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e; + struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f; uint64_t *g; int32_t *h; - int32_t * CBINDGEN_NONNULL *i; + int32_t *CBINDGEN_NONNULL *i; const uint64_t *j; uint64_t *k; }; struct References { - const struct Opaque * CBINDGEN_NONNULL a; - struct Opaque * CBINDGEN_NONNULL b; + const struct Opaque *CBINDGEN_NONNULL a; + struct Opaque *CBINDGEN_NONNULL b; const struct Opaque *c; struct Opaque *d; }; @@ -37,21 +37,21 @@ struct References { extern "C" { #endif // __cplusplus -void mut_ref_arg(const struct Pointers_u64 * CBINDGEN_NONNULL arg); +void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg); -void mutltiple_args(int32_t * CBINDGEN_NONNULL arg, +void mutltiple_args(int32_t *CBINDGEN_NONNULL arg, struct Pointers_u64 *foo, - struct Opaque * CBINDGEN_NONNULL * CBINDGEN_NONNULL d); + struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d); void nullable_const_ptr(const struct Pointers_u64 *arg); void nullable_mut_ptr(struct Pointers_u64 *arg); -void optional_mut_ref_arg(const struct Pointers_u64 *arg); +void optional_mut_ref_arg(struct Pointers_u64 *arg); -void optional_ref_arg(struct Pointers_u64 *arg); +void optional_ref_arg(const struct Pointers_u64 *arg); -void ref_arg(struct Pointers_u64 * CBINDGEN_NONNULL arg); +void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg); void value_arg(struct References arg);