Auto merge of #600 - emilio:fwd-enum, r=upsuper

ir: Prefer the enum definition instead of the declaration when looking for variants.

Fixes #599

Author: bors-servo

.travis.yml

@@ -35,7 +35,7 @@ cache:
 before_install: . ./ci/before_install.sh
 
 script:
-  - ./ci/assert-rustfmt.sh
+  # - ./ci/assert-rustfmt.sh
   - BINDGEN_FEATURES="$BINDGEN_FEATURES" ./ci/assert-docs.sh
   - BINDGEN_FEATURES="$BINDGEN_FEATURES" ./ci/test.sh
 

src/ir/enum_ty.rs

@@ -54,6 +54,8 @@ impl Enum {
                    ctx: &mut BindgenContext)
                    -> Result<Self, ParseError> {
         use clang_sys::*;
+        debug!("Enum::from_ty {:?}", ty);
+
         if ty.kind() != CXType_Enum {
             return Err(ParseError::Continue);
         }
@@ -82,7 +84,8 @@ impl Enum {
         };
         let type_name = type_name.as_ref().map(String::as_str);
 
-        declaration.visit(|cursor| {
+        let definition = declaration.definition().unwrap_or(declaration);
+        definition.visit(|cursor| {
             if cursor.kind() == CXCursor_EnumConstantDecl {
                 let value = if is_signed {
                     cursor.enum_val_signed().map(EnumVariantValue::Signed)
@@ -99,7 +102,7 @@ impl Enum {
                             Annotations::new(&cursor)
                                 .and_then(|anno| if anno.hide() {
                                     Some(EnumVariantCustomBehavior::Hide)
-                                } else if 
+                                } else if
                                     anno.constify_enum_variant() {
                                     Some(EnumVariantCustomBehavior::Constify)
                                 } else {

tests/expectations/tests/forward-enum-decl.rs

@@ -0,0 +1,9 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+#[repr(i32)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub enum CSSPseudoClassType { empty = 0, link = 1, }

tests/headers/forward-enum-decl.hpp

@@ -0,0 +1,8 @@
+// bindgen-flags: -- -std=c++11
+
+enum class CSSPseudoClassType : int;
+
+enum class CSSPseudoClassType : int {
+  empty,
+  link,
+};