diff options
| author | bors <bors@rust-lang.org> | 2024-06-19 06:26:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-19 06:26:33 +0000 |
| commit | ac4f1c41292c5b5e72e42ebdff38cb04cf9f304d (patch) | |
| tree | 6ad18502b12564bac17108d771d900947abbefcb /compiler/rustc_const_eval/src/errors.rs | |
| parent | 62ef90cf46ebe1c52b9757171a3067dcde629823 (diff) | |
| parent | 3e93254d5e2efb3d2dd738833142de9274c7b191 (diff) | |
| download | rust-ac4f1c41292c5b5e72e42ebdff38cb04cf9f304d.tar.gz rust-ac4f1c41292c5b5e72e42ebdff38cb04cf9f304d.zip | |
Auto merge of #3685 - rust-lang:rustup-2024-06-19, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_const_eval/src/errors.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/errors.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/errors.rs b/compiler/rustc_const_eval/src/errors.rs index 91d17fdd895..5fa48a59794 100644 --- a/compiler/rustc_const_eval/src/errors.rs +++ b/compiler/rustc_const_eval/src/errors.rs @@ -2,7 +2,7 @@ use std::borrow::Cow; use either::Either; use rustc_errors::{ - codes::*, Diag, DiagArgValue, DiagCtxt, DiagMessage, Diagnostic, EmissionGuarantee, Level, + codes::*, Diag, DiagArgValue, DiagCtxtHandle, DiagMessage, Diagnostic, EmissionGuarantee, Level, }; use rustc_hir::ConstContext; use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic}; @@ -453,7 +453,7 @@ pub trait ReportErrorExt { } } -fn bad_pointer_message(msg: CheckInAllocMsg, dcx: &DiagCtxt) -> String { +fn bad_pointer_message(msg: CheckInAllocMsg, dcx: DiagCtxtHandle<'_>) -> String { use crate::fluent_generated::*; let msg = match msg { |