Skip to content

Commit 897c182

Browse files
committed
FIXME(52456) remove fixme and combine all extern items in one block
1 parent 1aaad19 commit 897c182

File tree

1 file changed

+6
-26
lines changed
  • src/librustc_codegen_llvm/llvm

1 file changed

+6
-26
lines changed

src/librustc_codegen_llvm/llvm/ffi.rs

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,15 +1601,12 @@ extern "C" {
16011601
-> &'a Value;
16021602
pub fn LLVMRustDIBuilderCreateOpDeref() -> i64;
16031603
pub fn LLVMRustDIBuilderCreateOpPlusUconst() -> i64;
1604-
}
16051604

1606-
#[allow(improper_ctypes)] // FIXME(#52456) needed for RustString.
1607-
extern "C" {
1605+
#[allow(improper_ctypes)]
16081606
pub fn LLVMRustWriteTypeToString(Type: &Type, s: &RustString);
1607+
#[allow(improper_ctypes)]
16091608
pub fn LLVMRustWriteValueToString(value_ref: &Value, s: &RustString);
1610-
}
16111609

1612-
extern "C" {
16131610
pub fn LLVMIsAConstantInt(value_ref: &Value) -> Option<&Value>;
16141611
pub fn LLVMIsAConstantFP(value_ref: &Value) -> Option<&Value>;
16151612

@@ -1687,56 +1684,39 @@ extern "C" {
16871684
pub fn LLVMRustDestroyArchive(AR: &'static mut Archive);
16881685

16891686
pub fn LLVMRustGetSectionName(SI: &SectionIterator, data: &mut *const c_char) -> size_t;
1690-
}
16911687

1692-
#[allow(improper_ctypes)] // FIXME(#52456) needed for RustString.
1693-
extern "C" {
1688+
#[allow(improper_ctypes)]
16941689
pub fn LLVMRustWriteTwineToString(T: &Twine, s: &RustString);
1695-
}
16961690

1697-
extern "C" {
16981691
pub fn LLVMContextSetDiagnosticHandler(C: &Context,
16991692
Handler: DiagnosticHandler,
17001693
DiagnosticContext: *mut c_void);
1701-
}
17021694

1703-
#[allow(improper_ctypes)] // FIXME(#52456) needed for RustString.
1704-
extern "C" {
1695+
#[allow(improper_ctypes)]
17051696
pub fn LLVMRustUnpackOptimizationDiagnostic(DI: &'a DiagnosticInfo,
17061697
pass_name_out: &RustString,
17071698
function_out: &mut Option<&'a Value>,
17081699
loc_line_out: &mut c_uint,
17091700
loc_column_out: &mut c_uint,
17101701
loc_filename_out: &RustString,
17111702
message_out: &RustString);
1712-
}
17131703

1714-
extern "C" {
17151704
pub fn LLVMRustUnpackInlineAsmDiagnostic(DI: &'a DiagnosticInfo,
17161705
cookie_out: &mut c_uint,
17171706
message_out: &mut Option<&'a Twine>,
17181707
instruction_out: &mut Option<&'a Value>);
1719-
}
17201708

1721-
#[allow(improper_ctypes)] // FIXME(#52456) needed for RustString.
1722-
extern "C" {
1709+
#[allow(improper_ctypes)]
17231710
pub fn LLVMRustWriteDiagnosticInfoToString(DI: &DiagnosticInfo, s: &RustString);
1724-
}
1725-
1726-
extern "C" {
17271711
pub fn LLVMRustGetDiagInfoKind(DI: &DiagnosticInfo) -> DiagnosticKind;
17281712

17291713
pub fn LLVMRustSetInlineAsmDiagnosticHandler(C: &Context,
17301714
H: InlineAsmDiagHandler,
17311715
CX: *mut c_void);
1732-
}
17331716

1734-
#[allow(improper_ctypes)] // FIXME(#52456) needed for RustString.
1735-
extern "C" {
1717+
#[allow(improper_ctypes)]
17361718
pub fn LLVMRustWriteSMDiagnosticToString(d: &SMDiagnostic, s: &RustString);
1737-
}
17381719

1739-
extern "C" {
17401720
pub fn LLVMRustWriteArchive(Dst: *const c_char,
17411721
NumMembers: size_t,
17421722
Members: *const &RustArchiveMember,

0 commit comments

Comments
 (0)