Disable HIR types.

Fix up our existing primitive types test. It relies on
`core::ffi:primitives` which will no longer behave correctly. It's been
migrated to use ffi_11 which will be the only supported path moving
forward.

PiperOrigin-RevId: 840301985

Author: thunderseethe

cc_bindings_from_rs/cmdline.rs

@@ -145,7 +145,7 @@ pub struct Cmdline {
 
     /// Feature flag for HIR types. When enabled, we will query the HIR for type sugar that does
     /// not appear in MIR types and use it to generate bindings.
-    #[clap(long, value_parser, value_name = "BOOL", default_value_t = true)]
+    #[clap(long, value_parser, value_name = "BOOL", default_value_t = false)]
     pub enable_hir_types: bool,
 
     /// Emit extra source information for generating cross-references.

cc_bindings_from_rs/test/consts/consts_cc_api.h

@@ -53,7 +53,7 @@ static constexpr std::int64_t LARGE_INT = INT64_C(9223372036854775807);
 static constexpr std::uint32_t UNSIGNED_INT = UINT32_C(4294967295);
 static constexpr std::uintptr_t SLICE_LENGTH = 11;
 static constexpr std::intptr_t ISIZE = INT64_C(42);
-static constexpr char CHAR = 42;
+static constexpr std::int8_t CHAR = 42;
 // Generated from:
 // cc_bindings_from_rs/test/consts/consts.rs;l=49
 struct CRUBIT_INTERNAL_RUST_TYPE(

cc_bindings_from_rs/test/primitive_types/BUILD

@@ -21,7 +21,10 @@ rust_library(
     aspect_hints = [
         "//features:experimental",
     ],
-    deps = ["@crate_index//:libc"],  # v0_2
+    deps = [
+        "//support/ffi_11",
+        "@crate_index//:libc",  # v0_2
+    ],
 )
 
 cc_bindings_from_rust(

cc_bindings_from_rs/test/primitive_types/primitive_types.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 pub mod test_c_void_ptr {
-    use core::ffi::c_void;
+    use ffi_11::c_void;
 
     // As struct member.
     pub struct StructWithCVoidPointerMember {
@@ -51,17 +51,17 @@ pub mod test_maybe_uninit {
 }
 
 extern "C" fn i8_func(_: i8) {}
-extern "C" fn c_char_func(_: core::ffi::c_char) {}
+extern "C" fn c_char_func(_: ffi_11::c_char) {}
 
 pub mod argument_types {
-    use core::ffi;
+    use ffi_11 as ffi;
 
     pub fn c_char_ptr_arg(_: *const ffi::c_char) {}
     pub fn c_char_mut_ptr_arg(_: *mut ffi::c_char) {}
 }
 
 pub mod return_types {
-    use core::ffi;
+    use ffi_11 as ffi;
 
     pub fn c_void() {}
     pub fn c_void_mut_ptr() -> *mut ffi::c_void {
@@ -72,7 +72,7 @@ pub mod return_types {
     }
 
     pub fn c_char() -> ffi::c_char {
-        0
+        ffi_11::c_char::from(0i8)
     }
     pub fn c_char_mut_ptr() -> *mut ffi::c_char {
         core::ptr::null_mut()
@@ -82,34 +82,34 @@ pub mod return_types {
     }
 
     pub fn c_schar() -> ffi::c_schar {
-        0
+        0i8
     }
     pub fn c_uchar() -> ffi::c_uchar {
-        0
+        0u8
     }
     pub fn c_short() -> ffi::c_short {
-        0
+        0i16
     }
     pub fn c_ushort() -> ffi::c_ushort {
-        0
+        0u16
     }
     pub fn c_int() -> ffi::c_int {
         0
     }
     pub fn c_uint() -> ffi::c_uint {
-        0
+        0u32
     }
     pub fn c_long() -> ffi::c_long {
-        0
+        0.into()
     }
     pub fn c_ulong() -> ffi::c_ulong {
-        0
+        0u32.into()
     }
     pub fn c_longlong() -> ffi::c_longlong {
-        0
+        0i64.into()
     }
     pub fn c_ulonglong() -> ffi::c_ulonglong {
-        0
+        0u64.into()
     }
     pub fn c_float() -> ffi::c_float {
         0.0
@@ -165,7 +165,7 @@ pub mod return_types {
 }
 
 pub mod field_types {
-    use core::ffi;
+    use ffi_11 as ffi;
     pub struct Types {
         pub c_void_mut_ptr: *mut ffi::c_void,
         pub c_void_const_ptr: *const ffi::c_void,