Fix bad rebase

Author: fitzgen

src/ir/ty.rs

@@ -1027,7 +1027,7 @@ impl Type {
                         TypeKind::Function(signature)
                         // Same here, with template specialisations we can safely
                         // assume this is a Comp(..)
-                    } else if ty.is_fully_specialized_template() {
+                    } else if ty.is_fully_instantiated_template() {
                         debug!("Template specialization: {:?}, {:?} {:?}",
                                ty,
                                location,
@@ -1042,8 +1042,7 @@ impl Type {
                         match location.kind() {
                             CXCursor_CXXBaseSpecifier |
                             CXCursor_ClassTemplate => {
-                                if location.kind() ==
-                                   CXCursor_CXXBaseSpecifier {
+                                if location.kind() == CXCursor_CXXBaseSpecifier {
                                     // In the case we're parsing a base specifier
                                     // inside an unexposed or invalid type, it means
                                     // that we're parsing one of two things:
@@ -1083,14 +1082,15 @@ impl Type {
                                     // [2]: forward-inherit-struct-with-fields.hpp
                                     // [3]: forward-inherit-struct.hpp
                                     // [4]: inherit-namespaced.hpp
-                                    if 
-                                        location.spelling()
-                                            .chars()
-                                            .all(|c| {
-                                                c.is_alphanumeric() || c == '_'
-                                            }) {
+                                    if location.spelling()
+                                           .chars()
+                                           .all(|c| {
+                                               c.is_alphanumeric() || c == '_'
+                                           }) {
                                         return Err(ParseError::Recurse);
                                     }
+                                } else {
+                                    name = location.spelling();
                                 }
 
                                 let complex = CompInfo::from_ty(potential_id,

tests/expectations/tests/issue-544-stylo-creduce-2.rs

@@ -0,0 +1,14 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct Foo {
+    pub member: Foo,
+}
+impl Default for Foo {
+    fn default() -> Self { unsafe { ::std::mem::zeroed() } }
+}

tests/expectations/tests/template-param-usage-7.rs

@@ -13,4 +13,4 @@ pub struct DoesNotUseU<T, V> {
 impl <T, V> Default for DoesNotUseU<T, V> {
     fn default() -> Self { unsafe { ::std::mem::zeroed() } }
 }
-pub type Alias = DoesNotUseU<::std::os::raw::c_int, ::std::os::raw::c_char>;
+pub type Alias = DoesNotUseU<::std::os::raw::c_int, ::std::os::raw::c_schar>;