diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-11-09 05:12:46 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-11-09 05:12:46 +0000 |
| commit | 15d883e5b73ce6758926d8e3ef4a307f9ac6092f (patch) | |
| tree | 0c85c9634f6ff5ec409a9589eb9636d8a1d435b9 /compiler/rustc_const_eval/src/errors.rs | |
| parent | beb8d6fac180a48381e7c7c21d94ba4e1cfab1be (diff) | |
| parent | 2ac1c1868f8034dd8a8b8d4c82fd0b9abb66a0f1 (diff) | |
| download | rust-15d883e5b73ce6758926d8e3ef4a307f9ac6092f.tar.gz rust-15d883e5b73ce6758926d8e3ef4a307f9ac6092f.zip | |
Merge from rustc
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 38b87b72634..14e8bebbb18 100644 --- a/compiler/rustc_const_eval/src/errors.rs +++ b/compiler/rustc_const_eval/src/errors.rs @@ -2,6 +2,7 @@ use std::borrow::Cow; use std::fmt::Write; use either::Either; +use rustc_abi::WrappingRange; use rustc_errors::codes::*; use rustc_errors::{ Diag, DiagArgValue, DiagCtxtHandle, DiagMessage, Diagnostic, EmissionGuarantee, Level, @@ -15,8 +16,7 @@ use rustc_middle::mir::interpret::{ }; use rustc_middle::ty::{self, Mutability, Ty}; use rustc_span::{Span, Symbol}; -use rustc_target::abi::WrappingRange; -use rustc_target::abi::call::AdjustForForeignAbiError; +use rustc_target::callconv::AdjustForForeignAbiError; use crate::interpret::InternKind; |