Tweak imports to make the LLVM FFI bindings easier to move

Author: Zalathar

compiler/rustc_codegen_llvm/src/coverageinfo/ffi.rs renamed to compiler/rustc_codegen_llvm/src/coverageinfo/coverage_ffi.rs

@@ -2,7 +2,7 @@
 
 use std::ffi::CString;
 
-use crate::coverageinfo::ffi;
+use crate::coverageinfo::coverage_ffi as ffi;
 use crate::llvm;
 
 pub(crate) fn covmap_var_name() -> CString {

compiler/rustc_codegen_llvm/src/coverageinfo/llvm_cov.rs

@@ -20,7 +20,7 @@ use tracing::debug;
 
 use crate::common::CodegenCx;
 use crate::coverageinfo::mapgen::{GlobalFileTable, VirtualFileMapping, spans};
-use crate::coverageinfo::{ffi, llvm_cov};
+use crate::coverageinfo::{coverage_ffi as ffi, llvm_cov};
 use crate::llvm;
 
 /// Intermediate coverage metadata for a single function, used to help build

compiler/rustc_codegen_llvm/src/coverageinfo/mapgen/covfun.rs

@@ -2,7 +2,7 @@ use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos, Pos, SourceFile, Span};
 use tracing::debug;
 
-use crate::coverageinfo::ffi;
+use crate::coverageinfo::coverage_ffi as ffi;
 use crate::coverageinfo::mapgen::LocalFileId;
 
 /// Line and byte-column coordinates of a source code span within some file.

compiler/rustc_codegen_llvm/src/coverageinfo/mapgen/spans.rs

@@ -13,7 +13,7 @@ use crate::builder::Builder;
 use crate::common::CodegenCx;
 use crate::llvm;
 
-pub(crate) mod ffi;
+pub(crate) mod coverage_ffi;
 mod llvm_cov;
 mod mapgen;
 

compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

@@ -19,15 +19,16 @@ use std::ptr;
 
 use bitflags::bitflags;
 use libc::{c_char, c_int, c_uchar, c_uint, c_ulonglong, c_void, size_t};
+use rustc_llvm::RustString;
 
-use super::RustString;
-use super::debuginfo::{
+use self::debuginfo::{
     DIArray, DIBuilder, DIDerivedType, DIDescriptor, DIEnumerator, DIFile, DIFlags,
     DIGlobalVariableExpression, DILocation, DISPFlags, DIScope, DISubprogram,
     DITemplateTypeParameter, DIType, DebugEmissionKind, DebugNameTableKind,
 };
+use crate::TryFromU32;
+use crate::coverageinfo::coverage_ffi;
 use crate::llvm::MetadataKindId;
-use crate::{TryFromU32, llvm};
 
 /// In the LLVM-C API, boolean values are passed as `typedef int LLVMBool`,
 /// which has a different ABI from Rust or C++ `bool`.
@@ -75,13 +76,13 @@ impl Debug for Bool {
 /// Being able to write `b.to_llvm_bool()` is less noisy than `llvm::Bool::from(b)`,
 /// while being more explicit and less mistake-prone than something like `b.into()`.
 pub(crate) trait ToLlvmBool: Copy {
-    fn to_llvm_bool(self) -> llvm::Bool;
+    fn to_llvm_bool(self) -> Bool;
 }
 
 impl ToLlvmBool for bool {
     #[inline(always)]
-    fn to_llvm_bool(self) -> llvm::Bool {
-        llvm::Bool::from_bool(self)
+    fn to_llvm_bool(self) -> Bool {
+        Bool::from_bool(self)
     }
 }
 
@@ -882,10 +883,10 @@ unsafe extern "C" {
         AsmStringSize: size_t,
         Constraints: *const c_uchar, // See "PTR_LEN_STR".
         ConstraintsSize: size_t,
-        HasSideEffects: llvm::Bool,
-        IsAlignStack: llvm::Bool,
+        HasSideEffects: Bool,
+        IsAlignStack: Bool,
         Dialect: AsmDialect,
-        CanThrow: llvm::Bool,
+        CanThrow: Bool,
     ) -> &'ll Value;
 
     pub(crate) safe fn LLVMGetTypeKind(Ty: &Type) -> RawEnum<TypeKind>;
@@ -1655,7 +1656,7 @@ unsafe extern "C" {
         ParentScope: Option<&'ll Metadata>,
         Name: *const c_uchar, // See "PTR_LEN_STR".
         NameLen: size_t,
-        ExportSymbols: llvm::Bool,
+        ExportSymbols: Bool,
     ) -> &'ll Metadata;
 
     pub(crate) fn LLVMDIBuilderCreateLexicalBlock<'ll>(
@@ -1843,7 +1844,7 @@ unsafe extern "C" {
         File: &'ll Metadata,
         LineNo: c_uint,
         Ty: &'ll Metadata,
-        AlwaysPreserve: llvm::Bool, // "If true, this descriptor will survive optimizations."
+        AlwaysPreserve: Bool, // "If true, this descriptor will survive optimizations."
         Flags: DIFlags,
         AlignInBits: u32,
     ) -> &'ll Metadata;
@@ -1857,7 +1858,7 @@ unsafe extern "C" {
         File: &'ll Metadata,
         LineNo: c_uint,
         Ty: &'ll Metadata,
-        AlwaysPreserve: llvm::Bool, // "If true, this descriptor will survive optimizations."
+        AlwaysPreserve: Bool, // "If true, this descriptor will survive optimizations."
         Flags: DIFlags,
     ) -> &'ll Metadata;
 }
@@ -2084,13 +2085,13 @@ unsafe extern "C" {
     pub(crate) fn LLVMRustCoverageWriteFunctionMappingsToBuffer(
         VirtualFileMappingIDs: *const c_uint,
         NumVirtualFileMappingIDs: size_t,
-        Expressions: *const crate::coverageinfo::ffi::CounterExpression,
+        Expressions: *const coverage_ffi::CounterExpression,
         NumExpressions: size_t,
-        CodeRegions: *const crate::coverageinfo::ffi::CodeRegion,
+        CodeRegions: *const coverage_ffi::CodeRegion,
         NumCodeRegions: size_t,
-        ExpansionRegions: *const crate::coverageinfo::ffi::ExpansionRegion,
+        ExpansionRegions: *const coverage_ffi::ExpansionRegion,
         NumExpansionRegions: size_t,
-        BranchRegions: *const crate::coverageinfo::ffi::BranchRegion,
+        BranchRegions: *const coverage_ffi::BranchRegion,
         NumBranchRegions: size_t,
         BufferOut: &RustString,
     );