mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make a name less ambiguous

Browse Source
This commit is contained in:
Ralf Jung 2022-07-07 12:01:36 -04:00
parent a73e2557c7
commit 1e0f3cb566
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_const_eval/src/const_eval/machine.rs
View File

@ -14,7 +14,7 @@ use rustc_middle::mir::AssertMessage;
use rustc_session::Limit; use rustc_session::Limit;
use rustc_span::symbol::{sym, Symbol}; use rustc_span::symbol::{sym, Symbol};
use rustc_target::abi::{Align, Size}; use rustc_target::abi::{Align, Size};
use rustc_target::spec::abi::Abi; use rustc_target::spec::abi::Abi as CallAbi;
use crate::interpret::{ use crate::interpret::{
self, compile_time_machine, AllocId, ConstAllocation, Frame, ImmTy, InterpCx, InterpResult, 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( fn find_mir_or_eval_fn(
ecx: &mut InterpCx<'mir, 'tcx, Self>, ecx: &mut InterpCx<'mir, 'tcx, Self>,
instance: ty::Instance<'tcx>, instance: ty::Instance<'tcx>,
_abi: Abi, _abi: CallAbi,
args: &[OpTy<'tcx>], args: &[OpTy<'tcx>],
_dest: &PlaceTy<'tcx>, _dest: &PlaceTy<'tcx>,
_ret: Option<mir::BasicBlock>, _ret: Option<mir::BasicBlock>,

10
compiler/rustc_const_eval/src/interpret/machine.rs
View File

@ -10,7 +10,7 @@ use rustc_middle::mir;
use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_span::def_id::DefId; use rustc_span::def_id::DefId;
use rustc_target::abi::Size; use rustc_target::abi::Size;
use rustc_target::spec::abi::Abi as FnAbi; use rustc_target::spec::abi::Abi as CallAbi;
use super::{ use super::{
AllocId, AllocRange, Allocation, ConstAllocation, Frame, ImmTy, InterpCx, InterpResult, AllocId, AllocRange, Allocation, ConstAllocation, Frame, ImmTy, InterpCx, InterpResult,
@ -139,7 +139,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
/// Whether to enforce integers and floats not having provenance. /// Whether to enforce integers and floats not having provenance.
fn enforce_number_no_provenance(ecx: &InterpCx<'mir, 'tcx, Self>) -> bool; fn enforce_number_no_provenance(ecx: &InterpCx<'mir, 'tcx, Self>) -> bool;
/// Whether function calls should be [ABI](FnAbi)-checked. /// Whether function calls should be [ABI](CallAbi)-checked.
fn enforce_abi(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool { fn enforce_abi(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool {
true true
} }
@ -170,7 +170,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
fn find_mir_or_eval_fn( fn find_mir_or_eval_fn(
ecx: &mut InterpCx<'mir, 'tcx, Self>, ecx: &mut InterpCx<'mir, 'tcx, Self>,
instance: ty::Instance<'tcx>, instance: ty::Instance<'tcx>,
abi: FnAbi, abi: CallAbi,
args: &[OpTy<'tcx, Self::PointerTag>], args: &[OpTy<'tcx, Self::PointerTag>],
destination: &PlaceTy<'tcx, Self::PointerTag>, destination: &PlaceTy<'tcx, Self::PointerTag>,
target: Option<mir::BasicBlock>, target: Option<mir::BasicBlock>,
@ -182,7 +182,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
fn call_extra_fn( fn call_extra_fn(
ecx: &mut InterpCx<'mir, 'tcx, Self>, ecx: &mut InterpCx<'mir, 'tcx, Self>,
fn_val: Self::ExtraFnVal, fn_val: Self::ExtraFnVal,
abi: FnAbi, abi: CallAbi,
args: &[OpTy<'tcx, Self::PointerTag>], args: &[OpTy<'tcx, Self::PointerTag>],
destination: &PlaceTy<'tcx, Self::PointerTag>, destination: &PlaceTy<'tcx, Self::PointerTag>,
target: Option<mir::BasicBlock>, target: Option<mir::BasicBlock>,
@ -480,7 +480,7 @@ pub macro compile_time_machine(<$mir: lifetime, $tcx: lifetime>) {
fn call_extra_fn( fn call_extra_fn(
_ecx: &mut InterpCx<$mir, $tcx, Self>, _ecx: &mut InterpCx<$mir, $tcx, Self>,
fn_val: !, fn_val: !,
_abi: FnAbi, _abi: CallAbi,
_args: &[OpTy<$tcx>], _args: &[OpTy<$tcx>],
_destination: &PlaceTy<$tcx, Self::PointerTag>, _destination: &PlaceTy<$tcx, Self::PointerTag>,
_target: Option<mir::BasicBlock>, _target: Option<mir::BasicBlock>,

4
compiler/rustc_mir_transform/src/const_prop.rs
View File

@ -23,7 +23,7 @@ use rustc_middle::ty::{
}; };
use rustc_span::{def_id::DefId, Span}; use rustc_span::{def_id::DefId, Span};
use rustc_target::abi::{self, HasDataLayout, Size, TargetDataLayout}; use rustc_target::abi::{self, HasDataLayout, Size, TargetDataLayout};
use rustc_target::spec::abi::Abi as FnAbi; use rustc_target::spec::abi::Abi as CallAbi;
use rustc_trait_selection::traits; use rustc_trait_selection::traits;
use crate::MirPass; use crate::MirPass;
@ -199,7 +199,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx>
fn find_mir_or_eval_fn( fn find_mir_or_eval_fn(
_ecx: &mut InterpCx<'mir, 'tcx, Self>, _ecx: &mut InterpCx<'mir, 'tcx, Self>,
_instance: ty::Instance<'tcx>, _instance: ty::Instance<'tcx>,
_abi: FnAbi, _abi: CallAbi,
_args: &[OpTy<'tcx>], _args: &[OpTy<'tcx>],
_destination: &PlaceTy<'tcx>, _destination: &PlaceTy<'tcx>,
_target: Option<BasicBlock>, _target: Option<BasicBlock>,

4
compiler/rustc_mir_transform/src/const_prop_lint.rs
View File

@ -24,7 +24,7 @@ use rustc_middle::ty::{
use rustc_session::lint; use rustc_session::lint;
use rustc_span::{def_id::DefId, Span}; use rustc_span::{def_id::DefId, Span};
use rustc_target::abi::{HasDataLayout, Size, TargetDataLayout}; use rustc_target::abi::{HasDataLayout, Size, TargetDataLayout};
use rustc_target::spec::abi::Abi; use rustc_target::spec::abi::Abi as CallAbi;
use rustc_trait_selection::traits; use rustc_trait_selection::traits;
use crate::MirLint; use crate::MirLint;
@ -191,7 +191,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx>
fn find_mir_or_eval_fn( fn find_mir_or_eval_fn(
_ecx: &mut InterpCx<'mir, 'tcx, Self>, _ecx: &mut InterpCx<'mir, 'tcx, Self>,
_instance: ty::Instance<'tcx>, _instance: ty::Instance<'tcx>,
_abi: Abi, _abi: CallAbi,
_args: &[OpTy<'tcx>], _args: &[OpTy<'tcx>],
_destination: &PlaceTy<'tcx>, _destination: &PlaceTy<'tcx>,
_target: Option<BasicBlock>, _target: Option<BasicBlock>,