Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #104215

Merged
merged 56 commits into from
Nov 10, 2022
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
c87567c
Add context to compiler error message
Oct 20, 2022
6cb6564
Update tests to match error message changes
Oct 20, 2022
c33ee13
Remove linuxkernel targets
alex Nov 5, 2022
de0ab1c
Merge apple_base and apple_sdk_base into one module
BlackHoleFox Oct 23, 2022
ae948c6
Cleanup Apple target specifications
BlackHoleFox Oct 23, 2022
16edaa5
Limit efiapi calling convention to supported arches
nicholasbishop Nov 5, 2022
a7a40dd
Simplify some `Autoderef::new` calls
oli-obk Nov 8, 2022
1d93b35
Remove overloaded_span argument from `new`, where it is usually redun…
oli-obk Nov 8, 2022
b745a29
Remove an unused span
oli-obk Nov 8, 2022
ef40824
Update books
ehuss Nov 8, 2022
ba359d8
Add support for custom MIR parsing
JakobDegen Aug 3, 2022
a68ec22
Fix `rustdoc --version` when used with download-rustc
jyn514 Nov 9, 2022
575f609
Port unknown feature diagnostic to the new framework
SLASHLogin Aug 25, 2022
a54c800
Formatting
SLASHLogin Aug 25, 2022
1c4bd83
locales formatting
SLASHLogin Aug 25, 2022
21b0426
Trailing whitespaces
SLASHLogin Aug 25, 2022
b164790
Change String in structs to &'a str
SLASHLogin Aug 25, 2022
69d412a
Missing lifetime parameter and formatting
SLASHLogin Aug 25, 2022
05ae7ec
Import `error creating import library`
SLASHLogin Aug 25, 2022
4c625dc
Port Instrument coverage requires llvm 12 to the new struct
SLASHLogin Aug 25, 2022
9f0c165
Port `symbol_already_defined` error
SLASHLogin Aug 25, 2022
ec1e101
Fix diag() and formatting
SLASHLogin Aug 25, 2022
59b8aed
Port branch protection on aarch64
SLASHLogin Aug 25, 2022
f031823
Formatting
SLASHLogin Aug 25, 2022
39d363f
Port layout size overflow
SLASHLogin Aug 26, 2022
5d79d3c
Port InvalidMinimumAlignment
SLASHLogin Aug 26, 2022
60ee496
Port LinkageConstOrMutType error
SLASHLogin Aug 26, 2022
02403ee
Reuse SymbolAlreadyDefined
SLASHLogin Aug 26, 2022
978b5f7
Port SanitizerMemtagRequiresMte
SLASHLogin Aug 26, 2022
d32caf9
Port ArchiveBuildFailure
SLASHLogin Aug 26, 2022
ddbb650
Import ErrorWritingDEFFile
SLASHLogin Aug 26, 2022
81f7a8d
Port ErrorCallingDllTool
SLASHLogin Aug 26, 2022
c01546f
Port `DlltoolFailImportLibrary` and implement `IntoDiagnosticArg` for…
SLASHLogin Aug 26, 2022
33ef16f
Port `UnknownArchiveKind`
SLASHLogin Aug 26, 2022
185ef7b
Port `MissingFeatures` and `TargetFeatureDisableOrEnable`
SLASHLogin Aug 26, 2022
1c7a801
Fix CI
SLASHLogin Aug 27, 2022
e9a5329
Correct tests to match errors
SLASHLogin Aug 30, 2022
67394e7
Flatten diagnostic structs
SLASHLogin Oct 30, 2022
3728e95
Port diagnostics created by `Handler`
SLASHLogin Oct 30, 2022
9a15458
Simplify existing Diagnostic implementations
SLASHLogin Oct 30, 2022
b4820a3
Delay diagnostic translation in `rustc_codegen_ssa`
SLASHLogin Nov 2, 2022
3b949eb
Add `replace_args` method for `rustc_errors::diagnostic::Diagnostic`
SLASHLogin Nov 3, 2022
0381e51
Formatting
SLASHLogin Nov 3, 2022
a8a8055
Use `LayoutError`'s implementation of `IntoDiagnostic`
SLASHLogin Nov 4, 2022
0baac88
Update compiler/rustc_codegen_llvm/src/back/archive.rs
SLASHLogin Nov 8, 2022
39895b0
Add constructor for `Diagnostic` that takes `Vec<(DiagnosticMessage, …
SLASHLogin Nov 9, 2022
caada74
Add missing `emitted_at` to the `Diagnostic`
SLASHLogin Nov 9, 2022
2206267
Rollup merge of #101005 - SLASHLogin:rustc_codegen_llvm_diagnostics, …
Manishearth Nov 9, 2022
46bc12c
Rollup merge of #103307 - b4den:master, r=estebank
Manishearth Nov 9, 2022
3f11d39
Rollup merge of #103464 - JakobDegen:mir-parsing, r=oli-obk
Manishearth Nov 9, 2022
017c9aa
Rollup merge of #103929 - BlackHoleFox:apple-targets-cleanup, r=petro…
Manishearth Nov 9, 2022
67c0bff
Rollup merge of #104015 - alex:remove-kernel, r=oli-obk
Manishearth Nov 9, 2022
bfd637a
Rollup merge of #104020 - nicholasbishop:bishop-limit-efiapi, r=nagisa
Manishearth Nov 9, 2022
a709cc1
Rollup merge of #104156 - oli-obk:autoderef, r=estebank
Manishearth Nov 9, 2022
656f56c
Rollup merge of #104171 - ehuss:update-books, r=ehuss
Manishearth Nov 9, 2022
70c04a2
Rollup merge of #104184 - jyn514:rustdoc-version, r=davidtwco
Manishearth Nov 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix diag() and formatting
SLASHLogin committed Nov 9, 2022

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit ec1e101e1b845579eaaed164b096ae3784f3479d
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/src/errors.rs
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ pub(crate) struct ErrorCreatingImportLibrary<'a> {
pub(crate) struct InstrumentCoverageRequiresLLVM12;

#[derive(SessionDiagnostic)]
#[diag(codegen_llvm::SymbolAlreadyDefined)]
#[diag(codegen_llvm::symbol_already_defined)]
pub(crate) struct SymbolAlreadyDefined<'a> {
#[primary_span]
pub span: Span,
4 changes: 3 additions & 1 deletion compiler/rustc_codegen_llvm/src/mono_item.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::attributes;
use crate::base;
use crate::context::CodegenCx;
use crate::errors::SymbolAlreadyDefined;
use crate::llvm;
use crate::type_of::LayoutLlvmExt;
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 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 {