Layout tests can still contain id in its name

[upsuper]

Input C/C++ Header

template<typename T>
class nsTArray {
  T* m;
};

struct Foo {
  nsTArray<int*> m;
};

Bindgen Invocation

$ bindgen input.hpp

Actual Results

#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct nsTArray<T> {
    pub m: *mut T,
    pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<T>>,
}
#[repr(C)]
#[derive(Debug, Copy)]
pub struct Foo {
    pub m: nsTArray<*mut ::std::os::raw::c_int>,
}
#[test]
fn bindgen_test_layout_Foo() {
    assert_eq!(::std::mem::size_of::<Foo>() , 8usize , concat ! (
               "Size of: " , stringify ! ( Foo ) ));
    assert_eq! (::std::mem::align_of::<Foo>() , 8usize , concat ! (
                "Alignment of " , stringify ! ( Foo ) ));
    assert_eq! (unsafe {
                & ( * ( 0 as * const Foo ) ) . m as * const _ as usize } ,
                0usize , concat ! (
                "Alignment of field: " , stringify ! ( Foo ) , "::" ,
                stringify ! ( m ) ));
}
impl Clone for Foo {
    fn clone(&self) -> Self { *self }
}
#[test]
fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_9_close0_instantiation() {
    assert_eq!(::std::mem::size_of::<nsTArray<*mut ::std::os::raw::c_int>>() ,
               8usize , concat ! (
               "Size of template specialization: " , stringify ! (
               nsTArray<*mut ::std::os::raw::c_int> ) ));
    assert_eq!(::std::mem::align_of::<nsTArray<*mut ::std::os::raw::c_int>>()
               , 8usize , concat ! (
               "Alignment of template specialization: " , stringify ! (
               nsTArray<*mut ::std::os::raw::c_int> ) ));
}

Expected Results

As can be seen, the layout test is called __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_9_close0_instantiation, where the _bindgen_ty_id_9 is sensible to context, so this can still cause merge conflicts.