Skip to content

Commit 29dad40

Browse files
authored
Merge pull request #1356 from Lytigas/fix-bindgen-args. r=emilio
Quote regexes in test headers
2 parents 0897443 + ed1caf0 commit 29dad40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+48
-48
lines changed

tests/headers/anon_enum.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
struct Test {
33
int foo;
44
float bar;

tests/headers/anon_enum_trait.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22

33
template<typename _Tp>
44
class DataType {

tests/headers/anon_enum_whitelist.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --whitelist-var NODE_.* --rustified-enum .*
1+
// bindgen-flags: --whitelist-var "NODE_.*" --rustified-enum ".*"
22

33
enum {
44
NODE_FLAG_FOO,

tests/headers/anon_union.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
template<typename T>
33
struct TErrorResult {
44
enum UnionState {

tests/headers/anon_union_1_0.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22

33
template<typename T>
44
struct TErrorResult {

tests/headers/bitfield-enum-basic.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --bitfield-enum "Foo|Buz|NS_.*|DUMMY_.*" --rustified-enum .* -- -std=c++11
1+
// bindgen-flags: --bitfield-enum "Foo|Buz|NS_.*|DUMMY_.*" --rustified-enum ".*" -- -std=c++11
22

33
enum Foo {
44
Bar = 1 << 1,

tests/headers/bitfield_align_2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22
enum MyEnum {
33
ONE,
44
TWO,

tests/headers/class_with_inner_struct.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
// bindgen-flags: -- -std=c++11
33

44
class A {

tests/headers/class_with_inner_struct_1_0.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
// bindgen-flags: -- -std=c++11
33

44
class A {

tests/headers/const_enum_unnamed.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum {
44
FOO_BAR,

tests/headers/constant-evaluate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// bindgen-unstable
2-
// bindgen-flags: --rustified-enum .*
2+
// bindgen-flags: --rustified-enum ".*"
33

44
enum {
55
foo = 4,

tests/headers/constify-enum.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum nsCSSPropertyID {
44
eCSSProperty_a,

tests/headers/constify-module-enums-types.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --constified-enum-module .*
1+
// bindgen-flags: --constified-enum-module ".*"
22

33
typedef enum foo {
44
THIS,
@@ -75,4 +75,4 @@ class Thing {
7575
};
7676

7777
foo func3(Thing<foo> arg1);
78-
foo func4(Thing< Thing<foo> > arg1);
78+
foo func4(Thing< Thing<foo> > arg1);

tests/headers/enum.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum Foo {
44
Bar = 0,

tests/headers/enum_alias.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++11
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++11
22

33
typedef unsigned char uint8_t;
44

tests/headers/enum_and_vtable_mangling.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum {
44
match,

tests/headers/enum_dupe.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum Foo {
44
Bar = 1,

tests/headers/enum_explicit_type.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++11
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++11
22

33
enum Foo: unsigned char {
44
Bar = 0,

tests/headers/enum_in_template_with_typedef.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++11
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++11
22

33
namespace std {
44
template <typename Char> class fbstring_core;

tests/headers/enum_negative.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum Foo {
44
Bar = -2,

tests/headers/enum_packed.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
enum __attribute__((packed)) Foo {
44
Bar = 0,

tests/headers/forward-enum-decl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++11
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++11
22

33
enum class CSSPseudoClassType : int;
44

tests/headers/func_ptr_in_struct.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
//
33
enum baz;
44

tests/headers/issue-372.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --enable-cxx-namespaces --rustified-enum .*
1+
// bindgen-flags: --enable-cxx-namespaces --rustified-enum ".*"
22
template <typename a, int b> class c { a e[b]; };
33
class d;
44
template <typename g, g f> class C { c<d, f> h; };

tests/headers/issue-410.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --enable-cxx-namespaces --whitelist-type JS::Value --rustified-enum .*
1+
// bindgen-flags: --enable-cxx-namespaces --whitelist-type JS::Value --rustified-enum ".*"
22

33
namespace JS {
44
class Value;

tests/headers/issue-493.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
template<class _CharT, class _Traits, class _Allocator>
33
class basic_string
44
{

tests/headers/issue-493_1_0.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22

33
template<class _CharT, class _Traits, class _Allocator>
44
class basic_string

tests/headers/issue-569-non-type-template-params-causing-layout-test-failures.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++14
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++14
22

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

tests/headers/issue-888-enum-var-decl-jump.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --enable-cxx-namespaces --rustified-enum .*
1+
// bindgen-flags: --enable-cxx-namespaces --rustified-enum ".*"
22

33
namespace Halide {
44
struct Type;

tests/headers/jsval_layout_opaque.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
// bindgen-flags: -- -std=c++11
33

44
/**

tests/headers/jsval_layout_opaque_1_0.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
// bindgen-flags: -- -std=c++11
33

44
/**

tests/headers/layout_array_too_long.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --impl-partialeq --rustified-enum ".*"
22
typedef unsigned char uint8_t;
33
typedef unsigned short uint16_t;
44
typedef unsigned int uint32_t;

tests/headers/layout_cmdline_token.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
/**
44
* Stores a pointer to the ops struct, and the offset: the place to
@@ -61,4 +61,4 @@ struct cmdline_token_num {
6161
struct cmdline_token_hdr hdr;
6262
struct cmdline_token_num_data num_data;
6363
};
64-
typedef struct cmdline_token_num cmdline_parse_token_num_t;
64+
typedef struct cmdline_token_num cmdline_parse_token_num_t;

tests/headers/layout_eth_conf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
typedef unsigned char uint8_t;
33
typedef unsigned short uint16_t;
44
typedef unsigned int uint32_t;

tests/headers/layout_eth_conf_1_0.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --rust-target 1.0 --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22

33
typedef unsigned char uint8_t;
44
typedef unsigned short uint16_t;

tests/headers/layout_large_align_field.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
typedef unsigned char uint8_t;
44
typedef unsigned short uint16_t;

tests/headers/no-recursive-whitelisting.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --no-recursive-whitelist --whitelist-type "Foo" --raw-line "pub enum Bar {}" --rustified-enum .*
1+
// bindgen-flags: --no-recursive-whitelist --whitelist-type "Foo" --raw-line "pub enum Bar {}" --rustified-enum ".*"
22

33
struct Bar;
44

tests/headers/no-std.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 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 .*
1+
// 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 ".*"
22
struct foo {
33
int a, b;
44
void* bar;

tests/headers/nsStyleAutoArray.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
template<typename T>
44
class nsTArray {

tests/headers/opaque-tracing.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --opaque-type=.* --whitelist-function=foo --with-derive-hash --with-derive-partialeq --with-derive-eq
1+
// bindgen-flags: --opaque-type ".*" --whitelist-function=foo --with-derive-hash --with-derive-partialeq --with-derive-eq
22

33
class Container;
44

tests/headers/overflowed_enum.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++11 -Wno-narrowing
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++11 -Wno-narrowing
22

33
enum Foo {
44
BAP_ARM = 0x93fcb9,

tests/headers/prepend-enum-constified-variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --no-prepend-enum-name --rustified-enum .*
1+
// bindgen-flags: --no-prepend-enum-name --rustified-enum ".*"
22

33
enum AVCodecID {
44
AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,

tests/headers/short-enums.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .* -- -std=c++11 -fshort-enums
1+
// bindgen-flags: --rustified-enum ".*" -- -std=c++11 -fshort-enums
22

33
typedef enum {
44
SOME_VALUE = 0x1,

tests/headers/struct_typedef.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
22
//
33
typedef struct {
44
_Bool has_name;

tests/headers/struct_typedef_ns.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --enable-cxx-namespaces --rustified-enum .*
1+
// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --enable-cxx-namespaces --rustified-enum ".*"
22

33
namespace whatever {
44
typedef struct {

tests/headers/weird_bitfields.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// bindgen-flags: --rustified-enum .*
1+
// bindgen-flags: --rustified-enum ".*"
22

33
// You can guess where this is taken from...
44
enum nsStyleSVGOpacitySource {

0 commit comments

Comments
 (0)