Skip to content

Commit 7c6ea65

Browse files
committed
rustc_codegen_llvm: less pubs
1 parent 7d97c59 commit 7c6ea65

File tree

10 files changed

+35
-24
lines changed

10 files changed

+35
-24
lines changed

compiler/rustc_codegen_llvm/src/abi.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ use rustc_codegen_ssa::traits::*;
1313
use rustc_codegen_ssa::MemFlags;
1414
use rustc_middle::bug;
1515
use rustc_middle::ty::layout::LayoutOf;
16-
pub use rustc_middle::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
16+
pub(crate) use rustc_middle::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
1717
use rustc_middle::ty::Ty;
1818
use rustc_session::config;
19-
pub use rustc_target::abi::call::*;
19+
pub(crate) use rustc_target::abi::call::*;
2020
use rustc_target::abi::{self, HasDataLayout, Int, Size};
21-
pub use rustc_target::spec::abi::Abi;
21+
pub(crate) use rustc_target::spec::abi::Abi;
2222
use rustc_target::spec::SanitizerSet;
2323

2424
use libc::c_uint;

compiler/rustc_codegen_llvm/src/attributes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::errors::{MissingFeatures, SanitizerMemtagRequiresMte, TargetFeatureDi
1515
use crate::llvm::AttributePlace::Function;
1616
use crate::llvm::{self, AllocKindFlags, Attribute, AttributeKind, AttributePlace, MemoryEffects};
1717
use crate::llvm_util;
18-
pub use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr};
18+
pub(crate) use rustc_attr::{InlineAttr, InstructionSetAttr, OptimizeAttr};
1919

2020
use crate::context::CodegenCx;
2121
use crate::value::Value;

compiler/rustc_codegen_llvm/src/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Code that is useful in various codegen modules.
22
33
use crate::consts::const_alloc_to_llvm;
4-
pub use crate::context::CodegenCx;
4+
pub(crate) use crate::context::CodegenCx;
55
use crate::llvm::{self, BasicBlock, Bool, ConstantInt, False, OperandBundleDef, True};
66
use crate::type_::Type;
77
use crate::value::Value;

compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ pub mod metadata;
5050
mod namespace;
5151
mod utils;
5252

53-
pub use self::create_scope_map::compute_mir_scopes;
54-
pub use self::metadata::build_global_var_di_node;
53+
pub(crate) use self::create_scope_map::compute_mir_scopes;
54+
pub(crate) use self::metadata::build_global_var_di_node;
5555

5656
#[allow(non_upper_case_globals)]
5757
const DW_TAG_auto_variable: c_uint = 0x100;

compiler/rustc_codegen_llvm/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use back::owned_target_machine::OwnedTargetMachine;
2121
use back::write::{create_informational_target_machine, create_target_machine};
2222

2323
use errors::ParseTargetMachineConfig;
24-
pub use llvm_util::target_features;
24+
pub(crate) use llvm_util::target_features;
2525
use rustc_ast::expand::allocator::AllocatorKind;
2626
use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule};
2727
use rustc_codegen_ssa::back::write::{

compiler/rustc_codegen_llvm/src/llvm/diagnostic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! LLVM diagnostic reports.
22
3-
pub use self::Diagnostic::*;
4-
pub use self::OptimizationDiagnosticKind::*;
3+
pub(crate) use self::Diagnostic::*;
4+
pub(crate) use self::OptimizationDiagnosticKind::*;
55

66
use crate::value::Value;
77
use libc::c_uint;

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

+19-4
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ pub enum DLLStorageClass {
161161
#[derive(Copy, Clone, Debug)]
162162
pub enum AttributeKind {
163163
AlwaysInline = 0,
164+
#[allow(dead_code)]
164165
ByVal = 1,
165166
Cold = 2,
166167
InlineHint = 3,
@@ -176,15 +177,19 @@ pub enum AttributeKind {
176177
OptimizeForSize = 13,
177178
ReadOnly = 14,
178179
SExt = 15,
180+
#[allow(dead_code)]
179181
StructRet = 16,
182+
#[allow(dead_code)]
180183
UWTable = 17,
181184
ZExt = 18,
182185
InReg = 19,
183186
SanitizeThread = 20,
184187
SanitizeAddress = 21,
185188
SanitizeMemory = 22,
186189
NonLazyBind = 23,
190+
#[allow(dead_code)]
187191
OptimizeNone = 24,
192+
#[allow(dead_code)]
188193
ReadNone = 26,
189194
SanitizeHWAddress = 28,
190195
WillReturn = 29,
@@ -195,6 +200,7 @@ pub enum AttributeKind {
195200
SanitizeMemTag = 34,
196201
NoCfCheck = 35,
197202
ShadowCallStack = 36,
203+
#[allow(dead_code)]
198204
AllocSize = 37,
199205
AllocatedPointer = 38,
200206
AllocAlign = 39,
@@ -289,6 +295,7 @@ impl RealPredicate {
289295
/// LLVMTypeKind
290296
#[derive(Copy, Clone, PartialEq, Debug)]
291297
#[repr(C)]
298+
#[allow(dead_code)]
292299
pub enum TypeKind {
293300
Void = 0,
294301
Half = 1,
@@ -418,16 +425,24 @@ pub enum FileType {
418425
#[derive(Copy, Clone)]
419426
#[repr(C)]
420427
pub enum MetadataType {
428+
#[allow(dead_code)]
421429
MD_dbg = 0,
430+
#[allow(dead_code)]
422431
MD_tbaa = 1,
432+
#[allow(dead_code)]
423433
MD_prof = 2,
434+
#[allow(dead_code)]
424435
MD_fpmath = 3,
425436
MD_range = 4,
437+
#[allow(dead_code)]
426438
MD_tbaa_struct = 5,
427439
MD_invariant_load = 6,
440+
#[allow(dead_code)]
428441
MD_alias_scope = 7,
442+
#[allow(dead_code)]
429443
MD_noalias = 8,
430444
MD_nontemporal = 9,
445+
#[allow(dead_code)]
431446
MD_mem_parallel_loop_access = 10,
432447
MD_nonnull = 11,
433448
MD_align = 17,
@@ -598,6 +613,7 @@ pub enum ThreadLocalMode {
598613
/// LLVMRustTailCallKind
599614
#[derive(Copy, Clone)]
600615
#[repr(C)]
616+
#[allow(dead_code)]
601617
pub enum TailCallKind {
602618
None,
603619
Tail,
@@ -662,9 +678,6 @@ extern "C" {
662678
pub struct Builder<'a>(InvariantOpaque<'a>);
663679
#[repr(C)]
664680
pub struct PassManager<'a>(InvariantOpaque<'a>);
665-
extern "C" {
666-
pub type Pass;
667-
}
668681
extern "C" {
669682
pub type TargetMachine;
670683
}
@@ -696,7 +709,6 @@ extern "C" {
696709
}
697710

698711
pub type DiagnosticHandlerTy = unsafe extern "C" fn(&DiagnosticInfo, *mut c_void);
699-
pub type InlineAsmDiagHandlerTy = unsafe extern "C" fn(&SMDiagnostic, *const c_void, c_uint);
700712

701713
pub mod debuginfo {
702714
use super::{InvariantOpaque, Metadata};
@@ -804,6 +816,7 @@ pub mod debuginfo {
804816
#[repr(C)]
805817
pub enum DebugNameTableKind {
806818
Default,
819+
#[allow(dead_code)]
807820
Gnu,
808821
None,
809822
}
@@ -1563,6 +1576,8 @@ extern "C" {
15631576
Name: *const c_char,
15641577
NameLen: size_t,
15651578
) -> Option<&Value>;
1579+
1580+
#[allow(dead_code)]
15661581
pub fn LLVMRustSetTailCallKind(CallInst: &Value, TKC: TailCallKind);
15671582

15681583
// Operations on attributes

compiler/rustc_codegen_llvm/src/llvm/mod.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
#![allow(non_snake_case)]
22

3-
pub use self::AtomicRmwBinOp::*;
4-
pub use self::CallConv::*;
5-
pub use self::CodeGenOptSize::*;
6-
pub use self::IntPredicate::*;
7-
pub use self::Linkage::*;
8-
pub use self::MetadataType::*;
9-
pub use self::RealPredicate::*;
3+
pub(crate) use self::CallConv::*;
4+
pub(crate) use self::CodeGenOptSize::*;
5+
pub(crate) use self::MetadataType::*;
106

117
use libc::c_uint;
128
use rustc_data_structures::small_c_str::SmallCStr;
@@ -21,7 +17,7 @@ pub mod archive_ro;
2117
pub mod diagnostic;
2218
mod ffi;
2319

24-
pub use self::ffi::*;
20+
pub(crate) use self::ffi::*;
2521

2622
impl LLVMRustResult {
2723
pub fn into_result(self) -> Result<(), ()> {

compiler/rustc_codegen_llvm/src/type_.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub use crate::llvm::Type;
1+
pub(crate) use crate::llvm::Type;
22

33
use crate::abi::{FnAbiLlvmExt, LlvmType};
44
use crate::common;

compiler/rustc_codegen_llvm/src/value.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub use crate::llvm::Value;
1+
pub(crate) use crate::llvm::Value;
22

33
use crate::llvm;
44

0 commit comments

Comments
 (0)