Rollup merge of #147322 - Zalathar:llvm-imports, r=jdonszelmann

cg_llvm: Consistently import `llvm::Type` and `llvm::Value`
We already have other modules that import these types and other types from `llvm`, so having the re-exports `type_::Type` and `value::Value` just distracts rust-analyzer and results in messier and less-consistent imports.
No functional change.

Author: matthiaskrgr

compiler/rustc_codegen_llvm/src/abi.rs

@@ -22,11 +22,9 @@ use smallvec::SmallVec;
 usecrate::attributes::{self, llfn_attrs_from_instance};
 usecrate::builder::Builder;
 usecrate::context::CodegenCx;
-usecrate::llvm::{self,Attribute,AttributePlace};
+usecrate::llvm::{self,Attribute,AttributePlace,Type,Value};
 usecrate::llvm_util;
-usecrate::type_::Type;
 usecrate::type_of::LayoutLlvmExt;
-usecrate::value::Value;
 
 traitArgAttributesExt{
 fnapply_attrs_to_llfn(&self,idx:AttributePlace,cx:&CodegenCx<'_,'_>,llfn:&Value);

compiler/rustc_codegen_llvm/src/asm.rs

@@ -13,14 +13,12 @@ use rustc_target::asm::*;
 use smallvec::SmallVec;
 use tracing::debug;
 
+usecrate::attributes;
 usecrate::builder::Builder;
 usecrate::common::Funclet;
 usecrate::context::CodegenCx;
-usecrate::llvm::ToLlvmBool;
-usecrate::type_::Type;
+usecrate::llvm::{self,ToLlvmBool,Type,Value};
 usecrate::type_of::LayoutLlvmExt;
-usecrate::value::Value;
-usecrate::{attributes, llvm};
 
 impl<'ll,'tcx>AsmBuilderMethods<'tcx>forBuilder<'_,'ll,'tcx>{
 fncodegen_inline_asm(

compiler/rustc_codegen_llvm/src/attributes.rs

@@ -13,8 +13,9 @@ use smallvec::SmallVec;
 usecrate::context::SimpleCx;
 usecrate::errors::SanitizerMemtagRequiresMte;
 usecrate::llvm::AttributePlace::Function;
-usecrate::llvm::{self,AllocKindFlags,Attribute,AttributeKind,AttributePlace,MemoryEffects};
-usecrate::value::Value;
+usecrate::llvm::{
+self,AllocKindFlags,Attribute,AttributeKind,AttributePlace,MemoryEffects,Value,
+};
 usecrate::{Session, attributes, llvm_util};
 
 pub(crate)fnapply_to_llfn(llfn:&Value,idx:AttributePlace,attrs:&[&Attribute]){

compiler/rustc_codegen_llvm/src/base.rs

@@ -28,10 +28,10 @@ use rustc_span::Symbol;
 use rustc_target::spec::SanitizerSet;
 
 usesuper::ModuleLlvm;
+usecrate::attributes;
 usecrate::builder::Builder;
 usecrate::context::CodegenCx;
-usecrate::value::Value;
-usecrate::{attributes, llvm};
+usecrate::llvm::{self,Value};
 
 pub(crate)structValueIter<'ll>{
 cur:Option<&'llValue>,

compiler/rustc_codegen_llvm/src/builder.rs

@@ -37,11 +37,9 @@ use crate::common::Funclet;
 usecrate::context::{CodegenCx,FullCx,GenericCx,SCx};
 usecrate::llvm::{
 self,AtomicOrdering,AtomicRmwBinOp,BasicBlock,FromGeneric,GEPNoWrapFlags,Metadata,TRUE,
-ToLlvmBool,
+ToLlvmBool,Type,Value,
 };
-usecrate::type_::Type;
 usecrate::type_of::LayoutLlvmExt;
-usecrate::value::Value;
 
 #[must_use]
 pub(crate)structGenericBuilder<'a,'ll,CX:Borrow<SCx<'ll>>>{

compiler/rustc_codegen_llvm/src/builder/autodiff.rs

@@ -12,9 +12,7 @@ use tracing::debug;
 usecrate::builder::{Builder,PlaceRef,UNNAMED};
 usecrate::context::SimpleCx;
 usecrate::declare::declare_simple_fn;
-usecrate::llvm;
-usecrate::llvm::{Metadata,TRUE,Type};
-usecrate::value::Value;
+usecrate::llvm::{self,Metadata,TRUE,Type,Value};
 
 pub(crate)fnadjust_activity_to_abi<'tcx>(
 tcx:TyCtxt<'tcx>,

compiler/rustc_codegen_llvm/src/callee.rs

@@ -10,8 +10,7 @@ use rustc_middle::ty::{self, Instance, TypeVisitableExt};
 use tracing::debug;
 
 usecrate::context::CodegenCx;
-usecrate::llvm;
-usecrate::value::Value;
+usecrate::llvm::{self,Value};
 
 /// Codegens a reference to a fn/method item, monomorphizing and
 /// inlining as it goes.

compiler/rustc_codegen_llvm/src/common.rs

@@ -20,9 +20,7 @@ use tracing::debug;
 usecrate::consts::const_alloc_to_llvm;
 pub(crate)usecrate::context::CodegenCx;
 usecrate::context::{GenericCx,SCx};
-usecrate::llvm::{self,BasicBlock,ConstantInt,FALSE,Metadata,TRUE,ToLlvmBool};
-usecrate::type_::Type;
-usecrate::value::Value;
+usecrate::llvm::{self,BasicBlock,ConstantInt,FALSE,Metadata,TRUE,ToLlvmBool,Type,Value};
 
 /*
 * A note on nomenclature of linking: "extern", "foreign", and "upcall".

compiler/rustc_codegen_llvm/src/consts.rs

@@ -21,10 +21,9 @@ use tracing::{debug, instrument, trace};
 
 usecrate::common::CodegenCx;
 usecrate::errors::SymbolAlreadyDefined;
-usecrate::type_::Type;
+usecrate::llvm::{self,Type,Value};
 usecrate::type_of::LayoutLlvmExt;
-usecrate::value::Value;
-usecrate::{base, debuginfo, llvm};
+usecrate::{base, debuginfo};
 
 pub(crate)fnconst_alloc_to_llvm<'ll>(
 cx:&CodegenCx<'ll,'_>,

compiler/rustc_codegen_llvm/src/context.rs

@@ -35,10 +35,8 @@ use crate::abi::to_llvm_calling_convention;
 usecrate::back::write::to_llvm_code_model;
 usecrate::callee::get_fn;
 usecrate::debuginfo::metadata::apply_vcall_visibility_metadata;
-usecrate::llvm::{Metadata,MetadataKindId,Module};
-usecrate::type_::Type;
-usecrate::value::Value;
-usecrate::{attributes, common, coverageinfo, debuginfo, llvm, llvm_util};
+usecrate::llvm::{self,Metadata,MetadataKindId,Module,Type,Value};
+usecrate::{attributes, common, coverageinfo, debuginfo, llvm_util};
 
 /// `TyCtxt` (and related cache datastructures) can't be move between threads.
 /// However, there are various cx related functions which we want to be available to the builder and