Auto merge of #1128 - emilio:not-yet-type, r=fitzgen

ir: We can't guarantee the type to be in the item map while propagating AlreadyResolved

The item may come from a recursive check down the stack, and as we say there:

> Unchecked because we haven't finished this type yet.

Fixes #1127

Cargo.toml

@@ -13,7 +13,7 @@ name = "bindgen"
 readme = "README.md"
 repository = "https://github.com/rust-lang-nursery/rust-bindgen"
 documentation = "https://docs.rs/bindgen"
-version = "0.31.2"
+version = "0.31.3"
 build = "build.rs"
 
 include = [

src/ir/item.rs

@@ -1512,7 +1512,7 @@ impl ClangItemParser for Item {
         let result = Type::from_clang_ty(id, ty, location, parent_id, ctx);
         let relevant_parent_id = parent_id.unwrap_or(current_module);
         let ret = match result {
-            Ok(ParseResult::AlreadyResolved(ty)) => Ok(ty.expect_type_id(ctx)),
+            Ok(ParseResult::AlreadyResolved(ty)) => Ok(ty.as_type_id_unchecked()),
             Ok(ParseResult::New(item, declaration)) => {
                 ctx.add_item(
                     Item::new(

tests/expectations/tests/issue-1127-not-yet-type.rs

@@ -0,0 +1,11 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
+
+
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct A {
+    pub _address: u8,
+}

tests/headers/issue-1127-not-yet-type.hpp

@@ -0,0 +1,13 @@
+// bindgen-flags: -- -std=c++11
+
+template <typename> struct A;
+template <typename, typename, bool> struct _Map_base;
+template <typename _Pair, typename _Traits>
+struct _Map_base<_Pair, _Traits, true> {
+  using __hashtable_base = A<_Traits>;
+  using key_type = typename __hashtable_base::key_type;
+  using mapped_type = typename _Pair::type;
+  mapped_type &at(const key_type &);
+};
+template <typename _Pair, typename _Traits>
+auto _Map_base<_Pair, _Traits, true>::at(const key_type &) -> mapped_type & {}