Skip to content

Commit 99fd588

Browse files
committed
Merge adjacent unsafe extern "C" blocks.
1 parent 2278470 commit 99fd588

File tree

1 file changed

+2
-26
lines changed
  • compiler/rustc_codegen_llvm/src/llvm

1 file changed

+2
-26
lines changed

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

+2-26
Original file line numberDiff line numberDiff line change
@@ -560,13 +560,11 @@ pub enum ArchiveKind {
560560
K_AIXBIG,
561561
}
562562

563-
// LLVMRustThinLTOData
564563
unsafe extern "C" {
564+
// LLVMRustThinLTOData
565565
pub type ThinLTOData;
566-
}
567566

568-
// LLVMRustThinLTOBuffer
569-
unsafe extern "C" {
567+
// LLVMRustThinLTOBuffer
570568
pub type ThinLTOBuffer;
571569
}
572570

@@ -630,26 +628,12 @@ struct InvariantOpaque<'a> {
630628
// Opaque pointer types
631629
unsafe extern "C" {
632630
pub type Module;
633-
}
634-
unsafe extern "C" {
635631
pub type Context;
636-
}
637-
unsafe extern "C" {
638632
pub type Type;
639-
}
640-
unsafe extern "C" {
641633
pub type Value;
642-
}
643-
unsafe extern "C" {
644634
pub type ConstantInt;
645-
}
646-
unsafe extern "C" {
647635
pub type Attribute;
648-
}
649-
unsafe extern "C" {
650636
pub type Metadata;
651-
}
652-
unsafe extern "C" {
653637
pub type BasicBlock;
654638
}
655639
#[repr(C)]
@@ -658,11 +642,7 @@ pub struct Builder<'a>(InvariantOpaque<'a>);
658642
pub struct PassManager<'a>(InvariantOpaque<'a>);
659643
unsafe extern "C" {
660644
pub type Pass;
661-
}
662-
unsafe extern "C" {
663645
pub type TargetMachine;
664-
}
665-
unsafe extern "C" {
666646
pub type Archive;
667647
}
668648
#[repr(C)]
@@ -671,11 +651,7 @@ pub struct ArchiveIterator<'a>(InvariantOpaque<'a>);
671651
pub struct ArchiveChild<'a>(InvariantOpaque<'a>);
672652
unsafe extern "C" {
673653
pub type Twine;
674-
}
675-
unsafe extern "C" {
676654
pub type DiagnosticInfo;
677-
}
678-
unsafe extern "C" {
679655
pub type SMDiagnostic;
680656
}
681657
#[repr(C)]

0 commit comments

Comments
 (0)