diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2024-01-21 05:45:45 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2024-01-21 05:45:45 +0000 |
| commit | 3c055f73feade43ca73d47fce55d0add9cebd07f (patch) | |
| tree | 52dc53152f535fad994d8975e519e3c1942fc931 /compiler/rustc_codegen_ssa/src/back | |
| parent | 384b2ab37529ba0ad07ea8271baf0f212bab2e5a (diff) | |
| parent | 6d7e80c5bc3cc3b176834322afc50dc8dd100599 (diff) | |
| download | rust-3c055f73feade43ca73d47fce55d0add9cebd07f.tar.gz rust-3c055f73feade43ca73d47fce55d0add9cebd07f.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index af1c6594446..5d497d4a188 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -14,7 +14,7 @@ use rustc_data_structures::memmap::Mmap; use rustc_data_structures::profiling::{SelfProfilerRef, VerboseTimingGuard}; use rustc_data_structures::sync::Lrc; use rustc_errors::emitter::Emitter; -use rustc_errors::{translation::Translate, DiagCtxt, DiagnosticId, FatalError, Level}; +use rustc_errors::{translation::Translate, DiagCtxt, FatalError, Level}; use rustc_errors::{DiagnosticBuilder, DiagnosticMessage, Style}; use rustc_fs_util::link_or_copy; use rustc_hir::def_id::{CrateNum, LOCAL_CRATE}; @@ -1000,7 +1000,7 @@ type DiagnosticArgName<'source> = Cow<'source, str>; struct Diagnostic { msgs: Vec<(DiagnosticMessage, Style)>, args: FxHashMap<DiagnosticArgName<'static>, rustc_errors::DiagnosticArgValue<'static>>, - code: Option<DiagnosticId>, + code: Option<String>, lvl: Level, } |