bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix diag() and formatting

Browse source
This commit is contained in:
SLASHLogin 2022-08-25 23:47:11 +02:00
parent 9f0c16576b
commit ec1e101e1b
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/errors.rs
View file

@ -49,7 +49,7 @@ pub(crate) struct ErrorCreatingImportLibrary<'a> {
pub(crate) struct InstrumentCoverageRequiresLLVM12; pub(crate) struct InstrumentCoverageRequiresLLVM12;
#[derive(SessionDiagnostic)] #[derive(SessionDiagnostic)]
#[diag(codegen_llvm::SymbolAlreadyDefined)] #[diag(codegen_llvm::symbol_already_defined)]
pub(crate) struct SymbolAlreadyDefined<'a> { pub(crate) struct SymbolAlreadyDefined<'a> {
#[primary_span] #[primary_span]
pub span: Span, pub span: Span,

4
compiler/rustc_codegen_llvm/src/mono_item.rs
View file

@ -1,6 +1,7 @@
use crate::attributes; use crate::attributes;
use crate::base; use crate::base;
use crate::context::CodegenCx; use crate::context::CodegenCx;
use crate::errors::SymbolAlreadyDefined;
use crate::llvm; use crate::llvm;
use crate::type_of::LayoutLlvmExt; use crate::type_of::LayoutLlvmExt;
use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::traits::*;
@ -25,7 +26,8 @@ impl<'tcx> PreDefineMethods<'tcx> for CodegenCx<'_, 'tcx> {
let llty = self.layout_of(ty).llvm_type(self); let llty = self.layout_of(ty).llvm_type(self);
let g = self.define_global(symbol_name, llty).unwrap_or_else(|| { let g = self.define_global(symbol_name, llty).unwrap_or_else(|| {
self.sess().emit_fatal(SymbolAlreadyDefined { span: self.tcx.def_span(def_id), symbol_name }) self.sess()
.emit_fatal(SymbolAlreadyDefined { span: self.tcx.def_span(def_id), symbol_name })
}); });
unsafe { unsafe {