diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-08-04 17:34:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-04 17:34:28 -0500 |
commit | 39a88d366cde89c04a78e01f0147b94ff1e3eb6a (patch) | |
tree | 016800421600e538f2529496c55c64e09c2eea21 /tests/headers/class_with_inner_struct_1_0.hpp | |
parent | de180c42e52d6b9236a11ba887a6896b4ffae819 (diff) | |
parent | f4763bc8d4754ee4f89b2ab29b45d4c18e14d647 (diff) |
Auto merge of #891 - fitzgen:fix-test-expectations, r=photoszzt
Fix test expectations
r? @photoszzt
cc @tmfink: I had to revert the target features commit because there were a bunch of compilation failures in the test expectations (we had another, earlier regression that accidentally made it so that we weren't compiling and running the test expectations in CI, so we didn't catch the target features PR's regressions).
Diffstat (limited to 'tests/headers/class_with_inner_struct_1_0.hpp')
-rw-r--r-- | tests/headers/class_with_inner_struct_1_0.hpp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/headers/class_with_inner_struct_1_0.hpp b/tests/headers/class_with_inner_struct_1_0.hpp deleted file mode 100644 index 5145337f..00000000 --- a/tests/headers/class_with_inner_struct_1_0.hpp +++ /dev/null @@ -1,44 +0,0 @@ -// bindgen-flags: --rust-target 1.0 -- -std=c++11 - - -class A { - unsigned c; - struct Segment { int begin, end; }; - union { - int f; - } named_union; - union { - int d; - }; -}; - -class B { - unsigned d; - struct Segment { int begin, end; }; -}; - - -enum class StepSyntax { - Keyword, // step-start and step-end - FunctionalWithoutKeyword, // steps(...) - FunctionalWithStartKeyword, // steps(..., start) - FunctionalWithEndKeyword, // steps(..., end) -}; - -class C { - unsigned d; - union { - struct { - float mX1; - float mY1; - float mX2; - float mY2; - } mFunc; - struct { - StepSyntax mStepSyntax; - unsigned int mSteps; - }; - }; - // To ensure it doesn't collide - struct Segment { int begin, end; }; -}; |