diff options
| author | Ralf Jung <post@ralfj.de> | 2022-07-07 12:01:36 -0400 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-07-07 12:01:36 -0400 |
| commit | 1e0f3cb56606e4e7e136b46b7461ddecb89e3527 (patch) | |
| tree | 37f70032bbbbd70c791eed88e166454880d3e474 /compiler/rustc_const_eval/src/const_eval | |
| parent | a73e2557c7ba25ddbc886ad9085a3025db51ceb3 (diff) | |
| download | rust-1e0f3cb56606e4e7e136b46b7461ddecb89e3527.tar.gz rust-1e0f3cb56606e4e7e136b46b7461ddecb89e3527.zip | |
make a name less ambiguous
Diffstat (limited to 'compiler/rustc_const_eval/src/const_eval')
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/machine.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/const_eval/machine.rs b/compiler/rustc_const_eval/src/const_eval/machine.rs index ac529bf152f..29ab1d18771 100644 --- a/compiler/rustc_const_eval/src/const_eval/machine.rs +++ b/compiler/rustc_const_eval/src/const_eval/machine.rs @@ -14,7 +14,7 @@ use rustc_middle::mir::AssertMessage; use rustc_session::Limit; use rustc_span::symbol::{sym, Symbol}; use rustc_target::abi::{Align, Size}; -use rustc_target::spec::abi::Abi; +use rustc_target::spec::abi::Abi as CallAbi; use crate::interpret::{ self, compile_time_machine, AllocId, ConstAllocation, Frame, ImmTy, InterpCx, InterpResult, @@ -263,7 +263,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, fn find_mir_or_eval_fn( ecx: &mut InterpCx<'mir, 'tcx, Self>, instance: ty::Instance<'tcx>, - _abi: Abi, + _abi: CallAbi, args: &[OpTy<'tcx>], _dest: &PlaceTy<'tcx>, _ret: Option<mir::BasicBlock>, |
