Skip to content

Quote regexes in test headers #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/headers/anon_enum.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
struct Test {
int foo;
float bar;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/anon_enum_trait.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"

template<typename _Tp>
class DataType {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/anon_enum_whitelist.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --whitelist-var NODE_.* --rustified-enum .*
// bindgen-flags: --whitelist-var "NODE_.*" --rustified-enum ".*"

enum {
NODE_FLAG_FOO,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/anon_union.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
template<typename T>
struct TErrorResult {
enum UnionState {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/anon_union_1_0.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"

template<typename T>
struct TErrorResult {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/bitfield-enum-basic.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --bitfield-enum "Foo|Buz|NS_.*|DUMMY_.*" --rustified-enum .* -- -std=c++11
// bindgen-flags: --bitfield-enum "Foo|Buz|NS_.*|DUMMY_.*" --rustified-enum ".*" -- -std=c++11

enum Foo {
Bar = 1 << 1,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/bitfield_align_2.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"
enum MyEnum {
ONE,
TWO,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/class_with_inner_struct.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
// bindgen-flags: -- -std=c++11

class A {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/class_with_inner_struct_1_0.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
// bindgen-flags: -- -std=c++11

class A {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/const_enum_unnamed.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum {
FOO_BAR,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/constant-evaluate.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// bindgen-unstable
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum {
foo = 4,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/constify-enum.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum nsCSSPropertyID {
eCSSProperty_a,
Expand Down
4 changes: 2 additions & 2 deletions tests/headers/constify-module-enums-types.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --constified-enum-module .*
// bindgen-flags: --constified-enum-module ".*"

typedef enum foo {
THIS,
Expand Down Expand Up @@ -75,4 +75,4 @@ class Thing {
};

foo func3(Thing<foo> arg1);
foo func4(Thing< Thing<foo> > arg1);
foo func4(Thing< Thing<foo> > arg1);
2 changes: 1 addition & 1 deletion tests/headers/enum.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum Foo {
Bar = 0,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_alias.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++11
// bindgen-flags: --rustified-enum ".*" -- -std=c++11

typedef unsigned char uint8_t;

Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_and_vtable_mangling.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum {
match,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_dupe.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum Foo {
Bar = 1,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_explicit_type.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++11
// bindgen-flags: --rustified-enum ".*" -- -std=c++11

enum Foo: unsigned char {
Bar = 0,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_in_template_with_typedef.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++11
// bindgen-flags: --rustified-enum ".*" -- -std=c++11

namespace std {
template <typename Char> class fbstring_core;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_negative.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum Foo {
Bar = -2,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/enum_packed.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

enum __attribute__((packed)) Foo {
Bar = 0,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/forward-enum-decl.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++11
// bindgen-flags: --rustified-enum ".*" -- -std=c++11

enum class CSSPseudoClassType : int;

Expand Down
2 changes: 1 addition & 1 deletion tests/headers/func_ptr_in_struct.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
//
enum baz;

Expand Down
2 changes: 1 addition & 1 deletion tests/headers/issue-372.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --enable-cxx-namespaces --rustified-enum .*
// bindgen-flags: --enable-cxx-namespaces --rustified-enum ".*"
template <typename a, int b> class c { a e[b]; };
class d;
template <typename g, g f> class C { c<d, f> h; };
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/issue-410.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --enable-cxx-namespaces --whitelist-type JS::Value --rustified-enum .*
// bindgen-flags: --enable-cxx-namespaces --whitelist-type JS::Value --rustified-enum ".*"

namespace JS {
class Value;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/issue-493.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
template<class _CharT, class _Traits, class _Allocator>
class basic_string
{
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/issue-493_1_0.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"

template<class _CharT, class _Traits, class _Allocator>
class basic_string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++14
// bindgen-flags: --rustified-enum ".*" -- -std=c++14

// Generated by C-Reduce, cleaned up and given names for readability.

Expand Down
2 changes: 1 addition & 1 deletion tests/headers/issue-888-enum-var-decl-jump.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --enable-cxx-namespaces --rustified-enum .*
// bindgen-flags: --enable-cxx-namespaces --rustified-enum ".*"

namespace Halide {
struct Type;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/jsval_layout_opaque.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
// bindgen-flags: -- -std=c++11

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/jsval_layout_opaque_1_0.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
// bindgen-flags: -- -std=c++11

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/layout_array_too_long.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rustified-enum ".*"
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
Expand Down
4 changes: 2 additions & 2 deletions tests/headers/layout_cmdline_token.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

/**
* Stores a pointer to the ops struct, and the offset: the place to
Expand Down Expand Up @@ -61,4 +61,4 @@ struct cmdline_token_num {
struct cmdline_token_hdr hdr;
struct cmdline_token_num_data num_data;
};
typedef struct cmdline_token_num cmdline_parse_token_num_t;
typedef struct cmdline_token_num cmdline_parse_token_num_t;
2 changes: 1 addition & 1 deletion tests/headers/layout_eth_conf.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/layout_eth_conf_1_0.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"

typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/layout_large_align_field.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/no-recursive-whitelisting.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --no-recursive-whitelist --whitelist-type "Foo" --raw-line "pub enum Bar {}" --rustified-enum .*
// bindgen-flags: --no-recursive-whitelist --whitelist-type "Foo" --raw-line "pub enum Bar {}" --rustified-enum ".*"

struct Bar;

Expand Down
2 changes: 1 addition & 1 deletion tests/headers/no-std.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --ctypes-prefix "libc" --use-core --raw-line "#![no_std]" --raw-line "mod libc { pub type c_int = i32; pub enum c_void {} }" --rustified-enum .*
// bindgen-flags: --ctypes-prefix "libc" --use-core --raw-line "#![no_std]" --raw-line "mod libc { pub type c_int = i32; pub enum c_void {} }" --rustified-enum ".*"
struct foo {
int a, b;
void* bar;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/nsStyleAutoArray.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

template<typename T>
class nsTArray {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/opaque-tracing.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --opaque-type=.* --whitelist-function=foo --with-derive-hash --with-derive-partialeq --with-derive-eq
// bindgen-flags: --opaque-type ".*" --whitelist-function=foo --with-derive-hash --with-derive-partialeq --with-derive-eq

class Container;

Expand Down
2 changes: 1 addition & 1 deletion tests/headers/overflowed_enum.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++11 -Wno-narrowing
// bindgen-flags: --rustified-enum ".*" -- -std=c++11 -Wno-narrowing

enum Foo {
BAP_ARM = 0x93fcb9,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/prepend-enum-constified-variant.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --no-prepend-enum-name --rustified-enum .*
// bindgen-flags: --no-prepend-enum-name --rustified-enum ".*"

enum AVCodecID {
AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/short-enums.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .* -- -std=c++11 -fshort-enums
// bindgen-flags: --rustified-enum ".*" -- -std=c++11 -fshort-enums

typedef enum {
SOME_VALUE = 0x1,
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/struct_typedef.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
//
typedef struct {
_Bool has_name;
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/struct_typedef_ns.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --enable-cxx-namespaces --rustified-enum .*
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --enable-cxx-namespaces --rustified-enum ".*"

namespace whatever {
typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion tests/headers/weird_bitfields.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bindgen-flags: --rustified-enum .*
// bindgen-flags: --rustified-enum ".*"

// You can guess where this is taken from...
enum nsStyleSVGOpacitySource {
Expand Down